Redesign BufferStorage11 to support simultaneously managing constant buffers and…

src/libGLESv2/renderer/BufferStorage11.h

@@ -14,6 +14,7 @@
 namespace rx
 {
 class Renderer11;
+class DirectBufferStorage11;
 
 class BufferStorage11 : public BufferStorage
 {
@@ -32,7 +33,7 @@ class BufferStorage11 : public BufferStorage
     virtual bool supportsDirectBinding() const;
     virtual void markBufferUsage();
 
-    ID3D11Buffer *getBuffer() const;
+    ID3D11Buffer *getBuffer(GLenum usage);
 
   private:
     Renderer11 *mRenderer;
@@ -40,9 +41,8 @@ class BufferStorage11 : public BufferStorage
     ID3D11Buffer *mStagingBuffer;
     unsigned int mStagingBufferSize;
 
-    ID3D11Buffer *mBuffer;
-    unsigned int mBufferSize;
-
+    typedef std::vector<DirectBufferStorage11*> DirectBufferList;
+    DirectBufferList mDirectBuffers;
     unsigned int mSize;
 
     void *mResolvedData;
@@ -53,6 +53,33 @@ class BufferStorage11 : public BufferStorage
     unsigned int mWriteUsageCount;
 };
 
+// Each instance of BufferStorageD3DBuffer11 is specialized for a class of D3D binding points
+// - vertex/index buffers
+// - uniform buffers
+// - (possibly in the future, transform feedback buffers)
+class DirectBufferStorage11
+{
+  public:
+    DirectBufferStorage11(Renderer11 *renderer, const GLenum target);
+    ~DirectBufferStorage11();
+
+    bool hasTarget(const GLenum target) const;
+    bool updateFromStagingBuffer(ID3D11Buffer *stagingBuffer, const size_t size, const size_t offset);
+
+    ID3D11Buffer *getD3DBuffer() { return mDirectBuffer; }
+    bool isDirty() const { return mDirty; }
+    void markDirty() { mDirty = true; }
+
+  private:
+    Renderer11 *mRenderer;
+    const GLenum mTarget;
+    ID3D11Buffer *mDirectBuffer;
+    size_t mBufferSize;
+    bool mDirty;
+
+    void fillBufferDesc(D3D11_BUFFER_DESC* bufferDesc, unsigned int bufferSize);
+};
+
 }
 
 #endif // LIBGLESV2_RENDERER_BUFFERSTORAGE11_H_

src/libGLESv2/renderer/InputLayoutCache.cpp

@@ -94,7 +94,7 @@ GLenum InputLayoutCache::applyVertexBuffers(TranslatedAttribute attributes[gl::M
             ilKey.elements[ilKey.elementCount].InstanceDataStepRate = attributes[i].divisor;
             ilKey.elementCount++;
 
-            vertexBuffers[i] = bufferStorage ? bufferStorage->getBuffer() : vertexBuffer->getBuffer();
+            vertexBuffers[i] = bufferStorage ? bufferStorage->getBuffer(GL_ARRAY_BUFFER) : vertexBuffer->getBuffer();
             vertexStrides[i] = attributes[i].stride;
             vertexOffsets[i] = attributes[i].offset;
         }

src/libGLESv2/renderer/Renderer11.cpp

@@ -1043,7 +1043,7 @@ GLenum Renderer11::applyIndexBuffer(const GLvoid *indices, gl::Buffer *elementAr
                 BufferStorage11 *storage = BufferStorage11::makeBufferStorage11(indexInfo->storage);
                 IndexBuffer11* indexBuffer = IndexBuffer11::makeIndexBuffer11(indexInfo->indexBuffer);
 
-                mDeviceContext->IASetIndexBuffer(storage->getBuffer(), indexBuffer->getIndexFormat(), indexInfo->startOffset);
+                mDeviceContext->IASetIndexBuffer(storage->getBuffer(GL_ELEMENT_ARRAY_BUFFER), indexBuffer->getIndexFormat(), indexInfo->startOffset);
 
                 mAppliedIBSerial = 0;
                 mAppliedStorageIBSerial = storage->getSerial();