Buffer11: Intel workaround for constant buffers.

src/libANGLE/renderer/d3d/WorkaroundsD3D.h

@@ -99,6 +99,12 @@ struct WorkaroundsD3D
     // a target with width or height < 16. To work around this bug, we call clear() twice on these
     // platforms. Tracking bug: https://crbug.com/655534
     bool callClearTwiceOnSmallTarget = false;
+
+    // On some Intel drivers, copying from staging storage to constant buffer storage does not
+    // seem to work. Work around this by keeping system memory storage as a canonical reference
+    // for buffer data.
+    // D3D11-only workaround. See http://crbug.com/593024.
+    bool useSystemMemoryForConstantBuffers = false;
 };
 
 }  // namespace rx

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

@@ -336,10 +336,13 @@ gl::Error Buffer11::setSubData(GLenum target, const void *data, size_t size, siz
         if (target == GL_UNIFORM_BUFFER)
         {
             // If we are a very large uniform buffer, keep system memory storage around so that we
-            // aren't forced to read back from a constant buffer.
+            // aren't forced to read back from a constant buffer. We also check the workaround for
+            // Intel - this requires us to use system memory so we don't end up having to copy from
+            // a constant buffer to a staging buffer.
             // TODO(jmadill): Use Context caps.
             if (offset == 0 && size >= mSize &&
-                size <= static_cast<UINT>(mRenderer->getNativeCaps().maxUniformBlockSize))
+                size <= static_cast<UINT>(mRenderer->getNativeCaps().maxUniformBlockSize) &&
+                !mRenderer->getWorkarounds().useSystemMemoryForConstantBuffers)
             {
                 ANGLE_TRY_RESULT(getBufferStorage(BUFFER_USAGE_UNIFORM), writeBuffer);
             }
@@ -558,6 +561,12 @@ gl::Error Buffer11::checkForDeallocation(BufferUsage usage)
 // Keep system memory when we are using it for the canonical version of data.
 bool Buffer11::canDeallocateSystemMemory() const
 {
+    // Must keep system memory on Intel.
+    if (mRenderer->getWorkarounds().useSystemMemoryForConstantBuffers)
+    {
+        return false;
+    }
+
     return (!mBufferStorages[BUFFER_USAGE_UNIFORM] ||
             mSize <= mRenderer->getNativeCaps().maxUniformBlockSize);
 }

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

@@ -1872,6 +1872,8 @@ WorkaroundsD3D GenerateWorkarounds(const Renderer11DeviceCaps &deviceCaps,
         workarounds.emulateTinyStencilTextures = false;
     }
 
+    workarounds.useSystemMemoryForConstantBuffers = IsIntel(adapterDesc.VendorId);
+
     return workarounds;
 }
 

src/tests/gl_tests/UniformBufferTest.cpp

@@ -98,13 +98,6 @@ TEST_P(UniformBufferTest, Simple)
 // The second step renders a color from a UBO with a non-zero offset.
 TEST_P(UniformBufferTest, UniformBufferRange)
 {
-    // TODO(jmadill): Figure out why this fails on Intel.
-    if (IsIntel() && IsD3D11())
-    {
-        std::cout << "Test skipped on Intel D3D11." << std::endl;
-        return;
-    }
-
     int px = getWindowWidth() / 2;
     int py = getWindowHeight() / 2;
 
@@ -272,12 +265,6 @@ TEST_P(UniformBufferTest, UniformBufferManyUpdates)
 // Use a large number of buffer ranges (compared to the actual size of the UBO)
 TEST_P(UniformBufferTest, ManyUniformBufferRange)
 {
-    // TODO(jmadill): Figure out why this fails on Intel.
-    if (IsIntel() && IsD3D11())
-    {
-        std::cout << "Test skipped on Intel D3D11." << std::endl;
-        return;
-    }
     int px = getWindowWidth() / 2;
     int py = getWindowHeight() / 2;
 
@@ -556,14 +543,6 @@ TEST_P(UniformBufferTest, ActiveUniformNumberAndName)
 // Test that using a very large buffer to back a small uniform block works OK.
 TEST_P(UniformBufferTest, VeryLarge)
 {
-    // TODO(jmadill): Figure out why this fails on Intel.
-    // See http://crbug.com/593024
-    if (IsIntel() && IsD3D11())
-    {
-        std::cout << "Test skipped on Intel D3D11." << std::endl;
-        return;
-    }
-
     glClear(GL_COLOR_BUFFER_BIT);
     float floatData[4] = {0.5f, 0.75f, 0.25f, 1.0f};