Vulkan: Use linkedShaderStages in GlslangGetShaderSpirvCode()

src/libANGLE/renderer/glslang_wrapper_utils.cpp

@@ -2158,7 +2158,6 @@ angle::Result GlslangGetShaderSpirvCode(const GlslangErrorCallback &callback,
                                         const gl::ShaderBitSet &linkedShaderStages,
                                         const gl::Caps &glCaps,
                                         const gl::ShaderMap<std::string> &shaderSources,
-                                        const ShaderMapInterfaceVariableInfoMap &variableInfoMap,
                                         gl::ShaderMap<SpirvBlob> *spirvBlobsOut)
 {
     // Enable SPIR-V and Vulkan rules when parsing GLSL
@@ -2180,7 +2179,7 @@ angle::Result GlslangGetShaderSpirvCode(const GlslangErrorCallback &callback,
     };
     glslang::TProgram program;
 
-    for (const gl::ShaderType shaderType : gl::AllShaderTypes())
+    for (const gl::ShaderType shaderType : linkedShaderStages)
     {
         if (shaderSources[shaderType].empty())
         {
@@ -2215,7 +2214,7 @@ angle::Result GlslangGetShaderSpirvCode(const GlslangErrorCallback &callback,
         ANGLE_GLSLANG_CHECK(callback, false, GlslangError::InvalidShader);
     }
 
-    for (const gl::ShaderType shaderType : gl::AllShaderTypes())
+    for (const gl::ShaderType shaderType : linkedShaderStages)
     {
         if (shaderSources[shaderType].empty())
         {

src/libANGLE/renderer/glslang_wrapper_utils.h

@@ -134,7 +134,6 @@ angle::Result GlslangGetShaderSpirvCode(const GlslangErrorCallback &callback,
                                         const gl::ShaderBitSet &linkedShaderStages,
                                         const gl::Caps &glCaps,
                                         const gl::ShaderMap<std::string> &shaderSources,
-                                        const ShaderMapInterfaceVariableInfoMap &variableInfoMap,
                                         gl::ShaderMap<SpirvBlob> *spirvBlobsOut);
 
 }  // namespace rx

src/libANGLE/renderer/metal/mtl_glslang_utils.mm

@@ -261,7 +261,7 @@ angle::Result GlslangGetShaderSpirvCode(ErrorHandler *context,
 
     ANGLE_TRY(rx::GlslangGetShaderSpirvCode(
         [context](GlslangError error) { return HandleError(context, error); }, linkedShaderStages,
-        glCaps, shaderSources, variableInfoMap, &initialSpirvBlobs));
+        glCaps, shaderSources, &initialSpirvBlobs));
 
     for (const gl::ShaderType shaderType : linkedShaderStages)
     {

src/libANGLE/renderer/vulkan/GlslangWrapperVk.cpp

@@ -70,17 +70,15 @@ void GlslangWrapperVk::GetShaderSource(const angle::FeaturesVk &features,
 }
 
 // static
-angle::Result GlslangWrapperVk::GetShaderCode(
-    vk::Context *context,
-    const gl::ShaderBitSet &linkedShaderStages,
-    const gl::Caps &glCaps,
-    const gl::ShaderMap<std::string> &shaderSources,
-    const ShaderMapInterfaceVariableInfoMap &variableInfoMap,
-    gl::ShaderMap<std::vector<uint32_t>> *shaderCodeOut)
+angle::Result GlslangWrapperVk::GetShaderCode(vk::Context *context,
+                                              const gl::ShaderBitSet &linkedShaderStages,
+                                              const gl::Caps &glCaps,
+                                              const gl::ShaderMap<std::string> &shaderSources,
+                                              gl::ShaderMap<std::vector<uint32_t>> *shaderCodeOut)
 {
     return GlslangGetShaderSpirvCode(
         [context](GlslangError error) { return ErrorHandler(context, error); }, linkedShaderStages,
-        glCaps, shaderSources, variableInfoMap, shaderCodeOut);
+        glCaps, shaderSources, shaderCodeOut);
 }
 
 // static

src/libANGLE/renderer/vulkan/GlslangWrapperVk.h

@@ -41,7 +41,6 @@ class GlslangWrapperVk
                                        const gl::ShaderBitSet &linkedShaderStages,
                                        const gl::Caps &glCaps,
                                        const gl::ShaderMap<std::string> &shaderSources,
-                                       const ShaderMapInterfaceVariableInfoMap &variableInfoMap,
                                        gl::ShaderMap<std::vector<uint32_t>> *shaderCodesOut);
 
     static angle::Result TransformSpirV(vk::Context *context,

src/libANGLE/renderer/vulkan/ProgramExecutableVk.cpp

@@ -56,13 +56,12 @@ ShaderInfo::~ShaderInfo() = default;
 
 angle::Result ShaderInfo::initShaders(ContextVk *contextVk,
                                       const gl::ShaderBitSet &linkedShaderStages,
-                                      const gl::ShaderMap<std::string> &shaderSources,
-                                      const ShaderMapInterfaceVariableInfoMap &variableInfoMap)
+                                      const gl::ShaderMap<std::string> &shaderSources)
 {
     ASSERT(!valid());
 
     ANGLE_TRY(GlslangWrapperVk::GetShaderCode(contextVk, linkedShaderStages, contextVk->getCaps(),
-                                              shaderSources, variableInfoMap, &mSpirvBlobs));
+                                              shaderSources, &mSpirvBlobs));
 
     mIsInitialized = true;
     return angle::Result::Continue;

src/libANGLE/renderer/vulkan/ProgramExecutableVk.h

@@ -30,8 +30,7 @@ class ShaderInfo final : angle::NonCopyable
 
     angle::Result initShaders(ContextVk *contextVk,
                               const gl::ShaderBitSet &linkedShaderStages,
-                              const gl::ShaderMap<std::string> &shaderSources,
-                              const ShaderMapInterfaceVariableInfoMap &variableInfoMap);
+                              const gl::ShaderMap<std::string> &shaderSources);
     void release(ContextVk *contextVk);
 
     ANGLE_INLINE bool valid() const { return mIsInitialized; }

src/libANGLE/renderer/vulkan/ProgramVk.cpp

@@ -274,9 +274,8 @@ std::unique_ptr<LinkEvent> ProgramVk::link(const gl::Context *context,
                                       &mExecutable.mVariableInfoMap);
 
     // Compile the shaders.
-    angle::Result status =
-        mOriginalShaderInfo.initShaders(contextVk, mState.getExecutable().getLinkedShaderStages(),
-                                        shaderSources, mExecutable.mVariableInfoMap);
+    angle::Result status = mOriginalShaderInfo.initShaders(
+        contextVk, mState.getExecutable().getLinkedShaderStages(), shaderSources);
     if (status != angle::Result::Continue)
     {
         return std::make_unique<LinkEventDone>(status);