commit 8aeeed6ef9a430bc5bd8dfd7ef25bc137bc1fb90
author Jamie Madill <jmadill@chromium.org> Wed Mar 15 18:09:26 2017 -0400
committer Commit Bot <commit-bot@chromium.org> Thu Mar 16 17:32:54 2017 +0000
tree 599360352a6c686808a61001744e9e849b59ad6b
parent a5eb2941d9eb86056d27be2a9615be46c54880da

D3D11: Work around compiler nested sampling bug.

We can potentially work around a bug in the HLSL compiler by
omitting the const qualifier from some sampling operations.

BUG=angleproject:1923

Change-Id: I8a5d119707721e9c19f06be4ad808f87bfcdbee5
Reviewed-on: https://chromium-review.googlesource.com/454938
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

src/compiler/translator/TextureFunctionHLSL.cpp

diff --git a/src/compiler/translator/TextureFunctionHLSL.cpp b/src/compiler/translator/TextureFunctionHLSL.cpp
index 1f3de5f..bc53473 100644
--- a/src/compiler/translator/TextureFunctionHLSL.cpp
+++ b/src/compiler/translator/TextureFunctionHLSL.cpp
@@ -296,7 +296,10 @@
         else
         {
             ASSERT(outputType == SH_HLSL_4_1_OUTPUT);
-            out << "const uint samplerIndex";
+            // A bug in the D3D compiler causes some nested sampling operations to fail.
+            // See http://anglebug.com/1923
+            // TODO(jmadill): Reinstate the const keyword when possible.
+            out << /*"const"*/ "uint samplerIndex";
         }
     }