Implemented VertexBuffer11.

src/build_angle.gypi

@@ -297,6 +297,8 @@
             'libGLESv2/renderer/VertexBuffer.h',
             'libGLESv2/renderer/VertexBuffer9.cpp',
             'libGLESv2/renderer/VertexBuffer9.h',
+            'libGLESv2/renderer/VertexBuffer11.cpp',
+            'libGLESv2/renderer/VertexBuffer11.h',
             'libGLESv2/renderer/VertexDeclarationCache.cpp',
             'libGLESv2/renderer/VertexDeclarationCache.h',
             'libGLESv2/ResourceManager.cpp',

src/libGLESv2/libGLESv2.vcxproj

@@ -264,6 +264,7 @@ copy "$(OutDir)libGLESv2.lib" "$(ProjectDir)..\..\lib\$(Configuration)\"
     <ClCompile Include="renderer\SwapChain9.cpp" />
     <ClCompile Include="renderer\TextureStorage.cpp" />
     <ClCompile Include="renderer\VertexBuffer.cpp" />
+    <ClCompile Include="renderer\VertexBuffer11.cpp" />
     <ClCompile Include="renderer\VertexBuffer9.cpp" />
     <ClCompile Include="renderer\VertexDataManager.cpp" />
     <ClCompile Include="renderer\VertexDeclarationCache.cpp" />
@@ -317,6 +318,7 @@ copy "$(OutDir)libGLESv2.lib" "$(ProjectDir)..\..\lib\$(Configuration)\"
     <ClInclude Include="renderer\SwapChain9.h" />
     <ClInclude Include="renderer\TextureStorage.h" />
     <ClInclude Include="renderer\VertexBuffer.h" />
+    <ClInclude Include="renderer\VertexBuffer11.h" />
     <ClInclude Include="renderer\VertexBuffer9.h" />
     <ClInclude Include="renderer\vertexconversion.h" />
     <ClInclude Include="renderer\VertexDataManager.h" />

src/libGLESv2/libGLESv2.vcxproj.filters

@@ -149,12 +149,15 @@
     <ClCompile Include="renderer\VertexBuffer9.cpp">
       <Filter>Renderer</Filter>
     </ClCompile>
+    <ClCompile Include="renderer\VertexBuffer11.cpp">
+      <Filter>Renderer</Filter>
+    </ClCompile>
     <ClCompile Include="renderer\Image11.cpp">
       <Filter>Renderer</Filter>
     </ClCompile>
     <ClCompile Include="Uniform.cpp">
       <Filter>Source Files</Filter>
-    </ClCompile>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="BinaryStream.h">
@@ -313,12 +316,9 @@
     <ClInclude Include="renderer\VertexBuffer9.h">
       <Filter>Renderer</Filter>
     </ClInclude>
-    <ClInclude Include="renderer\Image11.h">
+    <ClInclude Include="renderer\VertexBuffer11.h">
       <Filter>Renderer</Filter>
-    </ClInclude>
-    <ClInclude Include="Uniform.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="libGLESv2.def">

src/libGLESv2/renderer/Renderer11.cpp

@@ -20,6 +20,7 @@
 #include "libGLESv2/renderer/ShaderExecutable11.h"
 #include "libGLESv2/renderer/SwapChain11.h"
 #include "libGLESv2/renderer/Image11.h"
+#include "libGLESv2/renderer/VertexBuffer11.h"
 
 #include "libEGL/Config.h"
 #include "libEGL/Display.h"
@@ -1250,9 +1251,7 @@ ShaderExecutable *Renderer11::compileToExecutable(gl::InfoLog &infoLog, const ch
 
 VertexBuffer *Renderer11::createVertexBuffer()
 {
-    // TODO
-    UNIMPLEMENTED();
-    return NULL;
+    return new VertexBuffer11(this);
 }
 
 bool Renderer11::blitRect(gl::Framebuffer *readTarget, gl::Rectangle *readRect, gl::Framebuffer *drawTarget, gl::Rectangle *drawRect,

src/libGLESv2/renderer/VertexBuffer11.h

+//
+// Copyright (c) 2012 The ANGLE Project Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+//
+
+// VertexBuffer11.h: Defines the D3D11 VertexBuffer implementation.
+
+#ifndef LIBGLESV2_RENDERER_VERTEXBUFFER11_H_
+#define LIBGLESV2_RENDERER_VERTEXBUFFER11_H_
+
+#include "libGLESv2/renderer/VertexBuffer.h"
+#include "libGLESv2/renderer/Renderer11.h"
+
+#include <d3d11.h>
+
+namespace rx
+{
+
+class VertexBuffer11 : public VertexBuffer
+{
+  public:
+    explicit VertexBuffer11(rx::Renderer11 *const renderer);
+    virtual ~VertexBuffer11();
+
+    virtual bool initialize(unsigned int size, bool dynamicUsage);
+
+    static VertexBuffer11 *makeVertexBuffer11(VertexBuffer *vetexBuffer);
+
+    virtual bool storeVertexAttributes(const gl::VertexAttribute &attrib, GLint start, GLsizei count, GLsizei instances,
+                                 unsigned int offset);
+    virtual bool storeRawData(const void* data, unsigned int size, unsigned int offset);
+
+    virtual unsigned int getSpaceRequired(const gl::VertexAttribute &attrib, GLsizei count, GLsizei instances) const;
+
+    virtual unsigned int getBufferSize() const;
+    virtual bool setBufferSize(unsigned int size);
+    virtual bool discard();
+
+    unsigned int getVertexSize(const gl::VertexAttribute &attrib) const;
+    DXGI_FORMAT getDXGIFormat(const gl::VertexAttribute &attrib) const;
+
+    ID3D11Buffer *getBuffer() const;
+
+  private:
+    DISALLOW_COPY_AND_ASSIGN(VertexBuffer11);
+
+    rx::Renderer11 *const mRenderer;
+
+    ID3D11Buffer *mBuffer;
+    unsigned int mBufferSize;
+    bool mDynamicUsage;
+
+    typedef void (*VertexConversionFunction)(const void *, unsigned int, unsigned int, void *);
+    struct VertexConverter
+    {
+        VertexConversionFunction conversionFunc;
+        DXGI_FORMAT dxgiFormat;
+        unsigned int outputElementSize;
+    };
+
+    enum { NUM_GL_VERTEX_ATTRIB_TYPES = 6 };
+
+    // This table is used to generate mAttributeTypes.
+    static const VertexConverter mPossibleTranslations[NUM_GL_VERTEX_ATTRIB_TYPES][2][4]; // [GL types as enumerated by typeIndex()][normalized][size - 1]
+
+    static const VertexConverter &getVertexConversion(const gl::VertexAttribute &attribute);
+};
+
+}
+
+#endif // LIBGLESV2_RENDERER_VERTEXBUFFER11_H_
\ No newline at end of file