Vulkan: Create TransformSpirvCode()

src/libANGLE/renderer/glslang_wrapper_utils.cpp

@@ -1915,6 +1915,26 @@ void GlslangGetShaderSource(GlslangSourceOptions &options,
     AssignNonTextureBindings(options, programState, programInterfaceInfo, variableInfoMapOut);
 }
 
+angle::Result TransformSpirvCode(const GlslangErrorCallback &callback,
+                                 const gl::ShaderType shaderType,
+                                 const ShaderInterfaceVariableInfoMap &variableInfoMap,
+                                 const SpirvBlob &initialSpirvBlob,
+                                 SpirvBlob *spirvBlobOut)
+{
+    if (initialSpirvBlob.empty())
+    {
+        return angle::Result::Continue;
+    }
+
+    // Transform the SPIR-V code by assigning location/set/binding values.
+    SpirvTransformer transformer(initialSpirvBlob, variableInfoMap, shaderType, spirvBlobOut);
+    ANGLE_GLSLANG_CHECK(callback, transformer.transform(), GlslangError::InvalidSpirv);
+
+    ASSERT(ValidateSpirv(*spirvBlobOut));
+
+    return angle::Result::Continue;
+}
+
 angle::Result GlslangGetShaderSpirvCode(const GlslangErrorCallback &callback,
                                         const gl::Caps &glCaps,
                                         const gl::ShaderMap<std::string> &shaderSources,
@@ -1924,24 +1944,15 @@ angle::Result GlslangGetShaderSpirvCode(const GlslangErrorCallback &callback,
     gl::ShaderMap<SpirvBlob> initialSpirvBlobs;
     ANGLE_TRY(GetShaderSpirvCode(callback, glCaps, shaderSources, &initialSpirvBlobs));
 
-    // Transform the SPIR-V code by assigning location/set/binding values.
     for (const gl::ShaderType shaderType : gl::AllShaderTypes())
     {
-        const std::vector<uint32_t> initialSpirvBlob = initialSpirvBlobs[shaderType];
-
-        if (initialSpirvBlob.empty())
+        angle::Result status =
+            TransformSpirvCode(callback, shaderType, variableInfoMap[shaderType],
+                               initialSpirvBlobs[shaderType], &(*spirvBlobsOut)[shaderType]);
+        if (status != angle::Result::Continue)
         {
-            continue;
+            return status;
         }
-
-        SpirvBlob *spirvBlob = &(*spirvBlobsOut)[shaderType];
-
-        // Transform the SPIR-V code by assigning location/set/binding values.
-        SpirvTransformer transformer(initialSpirvBlob, variableInfoMap[shaderType], shaderType,
-                                     spirvBlob);
-        ANGLE_GLSLANG_CHECK(callback, transformer.transform(), GlslangError::InvalidSpirv);
-
-        ASSERT(ValidateSpirv(*spirvBlob));
     }
 
     return angle::Result::Continue;

src/libANGLE/renderer/glslang_wrapper_utils.h

@@ -109,6 +109,12 @@ void GlslangGetShaderSource(GlslangSourceOptions &options,
                             gl::ShaderMap<std::string> *shaderSourcesOut,
                             ShaderMapInterfaceVariableInfoMap *variableInfoMapOut);
 
+angle::Result TransformSpirvCode(const GlslangErrorCallback &callback,
+                                 const gl::ShaderType shaderType,
+                                 const ShaderInterfaceVariableInfoMap &variableInfoMap,
+                                 const std::vector<uint32_t> &initialSpirvBlob,
+                                 SpirvBlob *spirvBlobOut);
+
 angle::Result GlslangGetShaderSpirvCode(const GlslangErrorCallback &callback,
                                         const gl::Caps &glCaps,
                                         const gl::ShaderMap<std::string> &shaderSources,

src/libANGLE/renderer/vulkan/GlslangWrapperVk.cpp

@@ -80,4 +80,17 @@ angle::Result GlslangWrapperVk::GetShaderCode(
         [context](GlslangError error) { return ErrorHandler(context, error); }, glCaps,
         shaderSources, variableInfoMap, shaderCodeOut);
 }
+
+// static
+angle::Result GlslangWrapperVk::TransformSpirV(
+    vk::Context *context,
+    const gl::ShaderType shaderType,
+    const ShaderInterfaceVariableInfoMap &variableInfoMap,
+    std::vector<uint32_t> &initialSpirvBlob,
+    std::vector<uint32_t> *shaderCodeOut)
+{
+    return TransformSpirvCode(
+        [context](GlslangError error) { return ErrorHandler(context, error); }, shaderType,
+        variableInfoMap, initialSpirvBlob, shaderCodeOut);
+}
 }  // namespace rx

src/libANGLE/renderer/vulkan/GlslangWrapperVk.h

@@ -42,6 +42,12 @@ class GlslangWrapperVk
                                        const gl::ShaderMap<std::string> &shaderSources,
                                        const ShaderMapInterfaceVariableInfoMap &variableInfoMap,
                                        gl::ShaderMap<std::vector<uint32_t>> *shaderCodesOut);
+
+    static angle::Result TransformSpirV(vk::Context *context,
+                                        const gl::ShaderType shaderType,
+                                        const ShaderInterfaceVariableInfoMap &variableInfoMap,
+                                        std::vector<uint32_t> &initialSpirvBlob,
+                                        std::vector<uint32_t> *shaderCodeOut);
 };
 }  // namespace rx