commit 00140f4a412896b269212c93f39426ee6143a5e6
author Geoff Lang <geofflang@chromium.org> Wed Feb 03 18:47:33 2016 +0000
committer Geoff Lang <geofflang@chromium.org> Wed Feb 03 18:49:22 2016 +0000
tree cde58f5ae9ee18b25df91491167c71007a76d001
parent 3026829e155bd89b5ca5b7b7c5267699b9192557

Revert "Pass texture base level to shaders on D3D11"

This reverts commit 3026829e155bd89b5ca5b7b7c5267699b9192557.

Change-Id: I0b4c3f5b1453b993b149423bb1ce407f4918cf54
Reviewed-on: https://chromium-review.googlesource.com/325435
Reviewed-by: Geoff Lang <geofflang@chromium.org>

src/compiler/translator/OutputHLSL.cpp

diff --git a/src/compiler/translator/OutputHLSL.cpp b/src/compiler/translator/OutputHLSL.cpp
index 602c839..170875e 100644
--- a/src/compiler/translator/OutputHLSL.cpp
+++ b/src/compiler/translator/OutputHLSL.cpp
@@ -183,8 +183,8 @@
         mUniformHLSL->reserveUniformRegisters(3);
     }
 
-    // Reserve registers for the default uniform block, driver constants and sampler metadata
-    mUniformHLSL->reserveInterfaceBlockRegisters(3);
+    // Reserve registers for the default uniform block and driver constants
+    mUniformHLSL->reserveInterfaceBlockRegisters(2);
 }
 
 OutputHLSL::~OutputHLSL()
@@ -506,11 +506,6 @@
             }
 
             out << "};\n";
-
-            if (mOutputType == SH_HLSL_4_1_OUTPUT)
-            {
-                mUniformHLSL->samplerMetadataUniforms(out);
-            }
         }
         else
         {
@@ -612,11 +607,6 @@
 
             out << "};\n"
                    "\n";
-
-            if (mOutputType == SH_HLSL_4_1_OUTPUT)
-            {
-                mUniformHLSL->samplerMetadataUniforms(out);
-            }
         }
         else
         {