commit 618bebcde4d6de75b108de83ee2f73c0e1926c0f
author Olli Etuaho <oetuaho@nvidia.com> Fri Jan 15 16:40:00 2016 +0200
committer Commit Bot <commit-bot@chromium.org> Mon Feb 15 11:45:52 2016 +0000
tree abb7ebb79cabb2f00bf0763b0660b6b61c6747c3
parent d14e3c45c50c5364d06b316236a88854d2f1e98b

Pass texture base level to shaders on D3D11

The base level is passed to shaders in an array included in the driver
uniform block. This is done on feature levels above 9_3, which treat
samplers as indices to sampler arrays in shaders.

A separate uniform block couldn't be used for the sampler metadata,
since that would bring the number of available uniform blocks down to
below minimum level defined by GLES 3.0.

BUG=angleproject:596
TEST=angle_end2end_tests

Change-Id: Ie040521402f9996d51a978aeeba9222e9dd761ce
Reviewed-on: https://chromium-review.googlesource.com/326290
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Olli Etuaho <oetuaho@nvidia.com>

src/compiler/translator/OutputHLSL.cpp

diff --git a/src/compiler/translator/OutputHLSL.cpp b/src/compiler/translator/OutputHLSL.cpp
index 253b966..90aa734 100644
--- a/src/compiler/translator/OutputHLSL.cpp
+++ b/src/compiler/translator/OutputHLSL.cpp
@@ -512,6 +512,11 @@
                 out << "    float2 dx_ViewScale : packoffset(c3);\n";
             }
 
+            if (mOutputType == SH_HLSL_4_1_OUTPUT)
+            {
+                mUniformHLSL->samplerMetadataUniforms(out, "c4");
+            }
+
             out << "};\n";
         }
         else
@@ -614,6 +619,11 @@
             out << "    float2 dx_ViewCoords : packoffset(c2);\n";
             out << "    float2 dx_ViewScale  : packoffset(c3);\n";
 
+            if (mOutputType == SH_HLSL_4_1_OUTPUT)
+            {
+                mUniformHLSL->samplerMetadataUniforms(out, "c4");
+            }
+
             out << "};\n"
                    "\n";
         }