Vulkan: Work around unused sampler validation.

src/libANGLE/renderer/vulkan/GlslangWrapper.cpp

@@ -95,6 +95,17 @@ void InsertQualifierSpecifierString(std::string *shaderString,
     angle::ReplaceSubstring(shaderString, searchString, replacementString);
 }
 
+void EraseLayoutAndQualifierStrings(std::string *vertexSource,
+                                    std::string *fragmentSource,
+                                    const std::string &uniformName)
+{
+    InsertLayoutSpecifierString(vertexSource, uniformName, "");
+    InsertLayoutSpecifierString(fragmentSource, uniformName, "");
+
+    InsertQualifierSpecifierString(vertexSource, uniformName, "");
+    InsertQualifierSpecifierString(fragmentSource, uniformName, "");
+}
+
 std::string GetMappedSamplerName(const std::string &originalName)
 {
     std::string samplerName = gl::ParseResourceName(originalName, nullptr);
@@ -216,10 +227,7 @@ gl::LinkResult GlslangWrapper::linkProgram(const gl::Context *glContext,
     // Remove all the markers for unused varyings.
     for (const std::string &varyingName : resources.varyingPacking.getInactiveVaryingNames())
     {
-        InsertLayoutSpecifierString(&vertexSource, varyingName, "");
-        InsertLayoutSpecifierString(&fragmentSource, varyingName, "");
-        InsertQualifierSpecifierString(&vertexSource, varyingName, "");
-        InsertQualifierSpecifierString(&fragmentSource, varyingName, "");
+        EraseLayoutAndQualifierStrings(&vertexSource, &fragmentSource, varyingName);
     }
 
     // Bind the default uniforms for vertex and fragment shaders.
@@ -262,21 +270,33 @@ gl::LinkResult GlslangWrapper::linkProgram(const gl::Context *glContext,
         textureCount++;
     }
 
+    // Start the unused sampler bindings at something ridiculously high.
+    constexpr int kBaseUnusedSamplerBinding = 100;
+    int unusedSamplerBinding                = kBaseUnusedSamplerBinding;
+
     for (const gl::UnusedUniform &unusedUniform : resources.unusedUniforms)
     {
-        std::string uniformName = unusedUniform.name;
         if (unusedUniform.isSampler)
         {
             // Samplers in structs are extracted and renamed.
-            uniformName = GetMappedSamplerName(uniformName);
-        }
+            std::string uniformName = GetMappedSamplerName(unusedUniform.name);
 
-        InsertLayoutSpecifierString(&vertexSource, uniformName, "");
-        InsertLayoutSpecifierString(&fragmentSource, uniformName, "");
+            std::stringstream layoutStringStream;
 
-        const std::string qualifierToUse = unusedUniform.isSampler ? kUniformQualifier : "";
-        InsertQualifierSpecifierString(&vertexSource, uniformName, qualifierToUse);
-        InsertQualifierSpecifierString(&fragmentSource, uniformName, qualifierToUse);
+            layoutStringStream << "set = 0, binding = " << unusedSamplerBinding++;
+
+            std::string layoutString = layoutStringStream.str();
+
+            InsertLayoutSpecifierString(&vertexSource, uniformName, layoutString);
+            InsertLayoutSpecifierString(&fragmentSource, uniformName, layoutString);
+
+            InsertQualifierSpecifierString(&vertexSource, uniformName, kUniformQualifier);
+            InsertQualifierSpecifierString(&fragmentSource, uniformName, kUniformQualifier);
+        }
+        else
+        {
+            EraseLayoutAndQualifierStrings(&vertexSource, &fragmentSource, unusedUniform.name);
+        }
     }
 
     std::array<const char *, 2> strings = {{vertexSource.c_str(), fragmentSource.c_str()}};

src/tests/deqp_support/deqp_gles2_test_expectations.txt

@@ -307,7 +307,6 @@
 2405 VULKAN : dEQP-GLES2.functional.vertex_arrays.single_attribute.usages.buffer_0_8_fixed* = SKIP
 2598 VULKAN : dEQP-GLES2.functional.rasterization.primitives.line* = SKIP
 2599 VULKAN : dEQP-GLES2.functional.rasterization.limits.points = SKIP
-2600 VULKAN : dEQP-GLES2.functional.state_query.shader.uniform_value_sampler = SKIP
 2601 VULKAN : dEQP-GLES2.functional.clipping.* = SKIP
 2353 VULKAN : dEQP-GLES2.functional.polygon_offset.* = SKIP
 2444 VULKAN : dEQP-GLES2.functional.draw.draw_arrays.points.default_attribute = SKIP