Prevent usage of GSSetConstantBuffers on D3D11 Feature Level 9_3

Calling GSSetConstantBuffers with real data causes a device removed error on 9_3. We therefore ensure that ANGLE doesn't call it on 9_3. Change-Id: I151a74ee7ea81fc4b795d8bf10d5e5c42bfe7c86 Reviewed-on: https://chromium-review.googlesource.com/236042Tested-by: Austin Kinross <aukinros@microsoft.com> Reviewed-by: Jamie Madill <jmadill@chromium.org>

Prevent usage of GSSetConstantBuffers on D3D11 Feature Level 9_3
366db7cd · Austin Kinross · Jamie Madill · 2609bf4c · 366db7cd
Commit 366db7cd authored Dec 16, 2014 by Austin Kinross Committed by Jamie Madill Dec 22, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 4 deletions

Renderer11.cpp src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp +8 -4

No files found.
--- a/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp
+++ b/src/libANGLE/renderer/d3d/d3d11/Renderer11.cpp
@@ -1743,11 +1743,15 @@ gl::Error Renderer11::applyUniforms(const ProgramImpl &program, const std::vecto
        memcpy(&mAppliedPixelConstants, &mPixelConstants, sizeof(dx_PixelConstants));
    }
-    // needed for the point sprite geometry shader
+    // GSSetConstantBuffers triggers device removal on 9_3, so we should only call it if necessary
-    if (mCurrentGeometryConstantBuffer != mDriverConstantBufferPS)
+    if (programD3D->usesGeometryShader())
    {
-        mDeviceContext->GSSetConstantBuffers(0, 1, &mDriverConstantBufferPS);
+        // needed for the point sprite geometry shader
-        mCurrentGeometryConstantBuffer = mDriverConstantBufferPS;
+        if (mCurrentGeometryConstantBuffer != mDriverConstantBufferPS)
+        {
+            mDeviceContext->GSSetConstantBuffers(0, 1, &mDriverConstantBufferPS);
+            mCurrentGeometryConstantBuffer = mDriverConstantBufferPS;
+        }
    }
    return gl::Error(GL_NO_ERROR);