Call BufferStorage::markUsage when we retrieve a buffer pointer for rendering,…

src/libGLESv2/renderer/BufferStorage.cpp

@@ -33,8 +33,4 @@ void BufferStorage::updateSerial()
     mSerial = mNextSerial++;
 }
 
-void BufferStorage::markBufferUsage()
-{
-}
-
 }

src/libGLESv2/renderer/BufferStorage.h

@@ -28,7 +28,6 @@ class BufferStorage
     virtual void clear() = 0;
     virtual unsigned int getSize() const = 0;
     virtual bool supportsDirectBinding() const = 0;
-    virtual void markBufferUsage();
     unsigned int getSerial() const;
 
   protected:

src/libGLESv2/renderer/BufferStorage11.cpp

@@ -222,7 +222,7 @@ void BufferStorage11::markBufferUsage()
     mReadUsageCount++;
     mWriteUsageCount++;
 
-    static const unsigned int usageLimit = 5;
+    const unsigned int usageLimit = 5;
 
     if (mReadUsageCount > usageLimit && mResolvedData)
     {
@@ -235,6 +235,8 @@ void BufferStorage11::markBufferUsage()
 
 ID3D11Buffer *BufferStorage11::getBuffer(GLenum usage)
 {
+    markBufferUsage();
+
     for (DirectBufferList::iterator it = mDirectBuffers.begin(); it != mDirectBuffers.end(); it++)
     {
         DirectBufferStorage11 *directBuffer = *it;

src/libGLESv2/renderer/BufferStorage11.h

@@ -31,7 +31,6 @@ class BufferStorage11 : public BufferStorage
     virtual void clear();
     virtual unsigned int getSize() const;
     virtual bool supportsDirectBinding() const;
-    virtual void markBufferUsage();
 
     ID3D11Buffer *getBuffer(GLenum usage);
 
@@ -51,6 +50,8 @@ class BufferStorage11 : public BufferStorage
 
     unsigned int mReadUsageCount;
     unsigned int mWriteUsageCount;
+
+    void markBufferUsage();
 };
 
 // Each instance of BufferStorageD3DBuffer11 is specialized for a class of D3D binding points

src/libGLESv2/renderer/IndexDataManager.cpp

@@ -162,7 +162,6 @@ GLenum IndexDataManager::prepareIndexData(GLenum type, GLsizei count, gl::Buffer
     {
         indexBuffer = streamingBuffer;
         streamOffset = offset;
-        storage->markBufferUsage();
         computeRange(type, indices, count, &translated->minIndex, &translated->maxIndex);
     }
     else if (staticBuffer && staticBuffer->getBufferSize() != 0 && staticBuffer->getIndexType() == type && alignedOffset)

src/libGLESv2/renderer/VertexDataManager.cpp

@@ -157,7 +157,6 @@ GLenum VertexDataManager::prepareVertexData(const gl::VertexAttribute attribs[],
                 {
                     outputElementSize = attribs[i].stride();
                     streamOffset = attribs[i].mOffset + outputElementSize * start;
-                    storage->markBufferUsage();
                 }
                 else if (staticBuffer)
                 {