Vulkan: Validate SPIR-V transformer at link time

src/libANGLE/renderer/vulkan/ProgramExecutableVk.cpp

@@ -44,6 +44,25 @@ VkDeviceSize GetShaderBufferBindingSize(const gl::OffsetBindingPointer<gl::Buffe
     ASSERT(bufferGL->getSize() >= bufferBinding.getOffset());
     return bufferGL->getSize() - bufferBinding.getOffset();
 }
+
+bool ValidateTransformedSpirV(ContextVk *contextVk,
+                              const gl::ShaderBitSet &linkedShaderStages,
+                              ProgramExecutableVk *executableVk,
+                              const gl::ShaderMap<SpirvBlob> &spirvBlobs)
+{
+    for (gl::ShaderType shaderType : linkedShaderStages)
+    {
+        SpirvBlob transformed;
+        if (GlslangWrapperVk::TransformSpirV(
+                contextVk, shaderType, false,
+                executableVk->getShaderInterfaceVariableInfoMap()[shaderType],
+                spirvBlobs[shaderType], &transformed) != angle::Result::Continue)
+        {
+            return false;
+        }
+    }
+    return true;
+}
 }  // namespace
 
 DefaultUniformBlock::DefaultUniformBlock() = default;
@@ -57,13 +76,17 @@ ShaderInfo::~ShaderInfo() = default;
 
 angle::Result ShaderInfo::initShaders(ContextVk *contextVk,
                                       const gl::ShaderBitSet &linkedShaderStages,
-                                      const gl::ShaderMap<std::string> &shaderSources)
+                                      const gl::ShaderMap<std::string> &shaderSources,
+                                      ProgramExecutableVk *executableVk)
 {
     ASSERT(!valid());
 
     ANGLE_TRY(GlslangWrapperVk::GetShaderCode(contextVk, linkedShaderStages, contextVk->getCaps(),
                                               shaderSources, &mSpirvBlobs));
 
+    // Assert that SPIR-V transformation is correct, even if the test never issues a draw call.
+    ASSERT(ValidateTransformedSpirV(contextVk, linkedShaderStages, executableVk, mSpirvBlobs));
+
     mIsInitialized = true;
     return angle::Result::Continue;
 }

src/libANGLE/renderer/vulkan/ProgramExecutableVk.h

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

src/libANGLE/renderer/vulkan/ProgramVk.cpp

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