BufferD3D: reinit static data only when the usage is static

src/libANGLE/renderer/d3d/BufferD3D.cpp

@@ -22,7 +22,8 @@ BufferD3D::BufferD3D(BufferFactoryD3D *factory)
       mFactory(factory),
       mStaticVertexBuffer(nullptr),
       mStaticIndexBuffer(nullptr),
-      mUnmodifiedDataUse(0)
+      mUnmodifiedDataUse(0),
+      mUsage(D3D_BUFFER_USAGE_STATIC)
 {
     updateSerial();
 }
@@ -38,6 +39,30 @@ void BufferD3D::updateSerial()
     mSerial = mNextSerial++;
 }
 
+void BufferD3D::updateD3DBufferUsage(GLenum usage)
+{
+    switch (usage)
+    {
+        case GL_STATIC_DRAW:
+        case GL_STATIC_READ:
+        case GL_STATIC_COPY:
+            mUsage = D3D_BUFFER_USAGE_STATIC;
+            initializeStaticData();
+            break;
+
+        case GL_STREAM_DRAW:
+        case GL_STREAM_READ:
+        case GL_STREAM_COPY:
+        case GL_DYNAMIC_READ:
+        case GL_DYNAMIC_COPY:
+        case GL_DYNAMIC_DRAW:
+            mUsage = D3D_BUFFER_USAGE_DYNAMIC;
+            break;
+        default:
+            UNREACHABLE();
+    }
+}
+
 void BufferD3D::initializeStaticData()
 {
     if (!mStaticVertexBuffer)
@@ -57,8 +82,12 @@ void BufferD3D::invalidateStaticData()
         SafeDelete(mStaticVertexBuffer);
         SafeDelete(mStaticIndexBuffer);
 
-        // Re-init static data to track that we're in a static buffer
-        initializeStaticData();
+        // If the buffer was created with a static usage then we recreate the static
+        // buffers so that they are populated the next time we use this buffer.
+        if (mUsage == D3D_BUFFER_USAGE_STATIC)
+        {
+            initializeStaticData();
+        }
     }
 
     mUnmodifiedDataUse = 0;

src/libANGLE/renderer/d3d/BufferD3D.h

@@ -20,6 +20,12 @@ class BufferFactoryD3D;
 class StaticIndexBufferInterface;
 class StaticVertexBufferInterface;
 
+enum D3DBufferUsage
+{
+    D3D_BUFFER_USAGE_STATIC,
+    D3D_BUFFER_USAGE_DYNAMIC,
+};
+
 class BufferD3D : public BufferImpl
 {
   public:
@@ -44,6 +50,7 @@ class BufferD3D : public BufferImpl
 
   protected:
     void updateSerial();
+    void updateD3DBufferUsage(GLenum usage);
 
     BufferFactoryD3D *mFactory;
     unsigned int mSerial;
@@ -52,6 +59,7 @@ class BufferD3D : public BufferImpl
     StaticVertexBufferInterface *mStaticVertexBuffer;
     StaticIndexBufferInterface *mStaticIndexBuffer;
     unsigned int mUnmodifiedDataUse;
+    D3DBufferUsage mUsage;
 };
 
 }

src/libANGLE/renderer/d3d/d3d11/Buffer11.cpp

@@ -275,11 +275,7 @@ gl::Error Buffer11::setData(const void *data, size_t size, GLenum usage)
         return error;
     }
 
-    if (usage == GL_STATIC_DRAW)
-    {
-        initializeStaticData();
-    }
-
+    updateD3DBufferUsage(usage);
     return error;
 }
 

src/libANGLE/renderer/d3d/d3d9/Buffer9.cpp

@@ -40,11 +40,7 @@ gl::Error Buffer9::setData(const void* data, size_t size, GLenum usage)
 
     invalidateStaticData();
 
-    if (usage == GL_STATIC_DRAW)
-    {
-        initializeStaticData();
-    }
-
+    updateD3DBufferUsage(usage);
     return gl::Error(GL_NO_ERROR);
 }