Vulkan: Fix qualifier replacement for sampler arrays.

The uniform name by default has the array subscript [0] appended. In the shader code it uses no subscript. Fix this by parsing out the subscript in the glslang wrapper subsitution step. This is a preliminary fix. More work on descriptor set layouts and pipeline layouts will be necessary to support sampler arrays. Bug: angleproject:2462 Change-Id: I57d6304f33822d588c7cb192607380c2f3ba20f5 Reviewed-on: https://chromium-review.googlesource.com/1089808 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Luc Ferron <lucferron@chromium.org> Reviewed-by: Frank Henigman <fjhenigman@chromium.org>

Vulkan: Fix qualifier replacement for sampler arrays.
8ed634c0 · Jamie Madill · Commit Bot · 9b168d02 · 8ed634c0
Commit 8ed634c0 authored Jun 13, 2018 by Jamie Madill Committed by Commit Bot Jun 13, 2018
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 6 deletions

GlslangWrapper.cpp src/libANGLE/renderer/vulkan/GlslangWrapper.cpp +8 -6

No files found.
--- a/src/libANGLE/renderer/vulkan/GlslangWrapper.cpp
+++ b/src/libANGLE/renderer/vulkan/GlslangWrapper.cpp
@@ -195,26 +195,28 @@ gl::LinkResult GlslangWrapper::linkProgram(const gl::Context *glContext,
        const gl::LinkedUniform &samplerUniform = uniforms[uniformIndex];
        std::string setBindingString = "set = 1, binding = " + Str(textureCount);

+        std::string samplerName = gl::ParseResourceName(samplerUniform.name, nullptr);
+
        ASSERT(samplerUniform.isActive(gl::ShaderType::Vertex) ||
               samplerUniform.isActive(gl::ShaderType::Fragment));
        if (samplerUniform.isActive(gl::ShaderType::Vertex))
        {
-            InsertLayoutSpecifierString(&vertexSource, samplerUniform.name, setBindingString);
-            InsertQualifierSpecifierString(&vertexSource, samplerUniform.name, kUniformQualifier);
+            InsertLayoutSpecifierString(&vertexSource, samplerName, setBindingString);
+            InsertQualifierSpecifierString(&vertexSource, samplerName, kUniformQualifier);
        }
        else
        {
-            InsertQualifierSpecifierString(&vertexSource, samplerUniform.name, "");
+            InsertQualifierSpecifierString(&vertexSource, samplerName, "");
        }

        if (samplerUniform.isActive(gl::ShaderType::Fragment))
        {
-            InsertLayoutSpecifierString(&fragmentSource, samplerUniform.name, setBindingString);
-            InsertQualifierSpecifierString(&fragmentSource, samplerUniform.name, kUniformQualifier);
+            InsertLayoutSpecifierString(&fragmentSource, samplerName, setBindingString);
+            InsertQualifierSpecifierString(&fragmentSource, samplerName, kUniformQualifier);
        }
        else
        {
-            InsertQualifierSpecifierString(&fragmentSource, samplerUniform.name, "");
+            InsertQualifierSpecifierString(&fragmentSource, samplerName, "");
        }

        textureCount += samplerUniform.getBasicTypeElementCount();