Set sampler uniform values from binding qualifiers

src/libANGLE/Program.cpp

@@ -711,6 +711,8 @@ Error Program::link(const gl::Context *context)
         gatherTransformFeedbackVaryings(mergedVaryings);
     }
 
+    setUniformValuesFromBindingQualifiers();
+
     gatherInterfaceBlockInfo();
 
     return NoError();
@@ -1933,12 +1935,12 @@ bool Program::linkUniforms(InfoLog &infoLog,
 
     linker.getResults(&mState.mUniforms, &mState.mUniformLocations);
 
-    updateSamplerBindings();
+    linkSamplerBindings();
 
     return true;
 }
 
-void Program::updateSamplerBindings()
+void Program::linkSamplerBindings()
 {
     mState.mSamplerUniformRange.end   = static_cast<unsigned int>(mState.mUniforms.size());
     mState.mSamplerUniformRange.start = mState.mSamplerUniformRange.end;
@@ -2574,6 +2576,28 @@ void Program::linkOutputVariables()
     }
 }
 
+void Program::setUniformValuesFromBindingQualifiers()
+{
+    for (unsigned int samplerIndex = mState.mSamplerUniformRange.start;
+         samplerIndex < mState.mSamplerUniformRange.end; ++samplerIndex)
+    {
+        const auto &samplerUniform = mState.mUniforms[samplerIndex];
+        if (samplerUniform.binding != -1)
+        {
+            GLint location = mState.getUniformLocation(samplerUniform.name);
+            ASSERT(location != -1);
+            std::vector<GLint> boundTextureUnits;
+            for (unsigned int elementIndex = 0; elementIndex < samplerUniform.elementCount();
+                 ++elementIndex)
+            {
+                boundTextureUnits.push_back(samplerUniform.binding + elementIndex);
+            }
+            setUniform1iv(location, static_cast<GLsizei>(boundTextureUnits.size()),
+                          boundTextureUnits.data());
+        }
+    }
+}
+
 void Program::gatherInterfaceBlockInfo()
 {
     ASSERT(mState.mUniformBlocks.empty());

src/libANGLE/Program.h

@@ -456,7 +456,7 @@ class Program final : angle::NonCopyable, public LabeledObject
     bool linkVaryings(InfoLog &infoLog) const;
 
     bool linkUniforms(InfoLog &infoLog, const Caps &caps, const Bindings &uniformLocationBindings);
-    void updateSamplerBindings();
+    void linkSamplerBindings();
 
     bool areMatchingInterfaceBlocks(InfoLog &infoLog,
                                     const sh::InterfaceBlock &vertexInterfaceBlock,
@@ -478,6 +478,8 @@ class Program final : angle::NonCopyable, public LabeledObject
     std::vector<PackedVarying> getPackedVaryings(const MergedVaryings &mergedVaryings) const;
     void linkOutputVariables();
 
+    void setUniformValuesFromBindingQualifiers();
+
     void gatherInterfaceBlockInfo();
     template <typename VarT>
     void defineUniformBlockMembers(const std::vector<VarT> &fields,

src/tests/deqp_support/deqp_gles31_test_expectations.txt

@@ -1422,8 +1422,6 @@
 1442 OPENGL D3D11 : dEQP-GLES31.functional.fbo.no_attachments.* = FAIL
 1442 OPENGL D3D11 : dEQP-GLES31.functional.fbo.completeness.no_attachments = FAIL
 1442 OPENGL D3D11 : dEQP-GLES31.functional.program_interface_query.* = FAIL
-1442 OPENGL D3D11 : dEQP-GLES31.functional.layout_binding.sampler.sampler2d.* = FAIL
-1442 OPENGL D3D11 : dEQP-GLES31.functional.layout_binding.sampler.sampler3d.* = FAIL
 1442 OPENGL D3D11 : dEQP-GLES31.functional.layout_binding.ubo.* = FAIL
 1442 OPENGL D3D11 : dEQP-GLES31.functional.layout_binding.ssbo.* = FAIL
 1442 OPENGL D3D11 : dEQP-GLES31.functional.layout_binding.image.image2d.* = FAIL