Add SPIRV patching to convert uniform block to push constants.

Author: hzqst

Graphics/ShaderTools/CMakeLists.txt

@@ -180,6 +180,17 @@ if(ENABLE_SPIRV)
         PRIVATE
             SPIRV-Tools-opt
         )
+        # Add SPIRV-Tools internal headers path for custom pass implementation
+        # We need both the source directory (for internal headers like pass.h)
+        # and the binary directory (for generated headers like NonSemanticShaderDebugInfo100.h)
+        get_target_property(SPIRV_TOOLS_SOURCE_DIR SPIRV-Tools-opt SOURCE_DIR)
+        get_target_property(SPIRV_TOOLS_BINARY_DIR SPIRV-Tools-opt BINARY_DIR)
+        get_filename_component(SPIRV_TOOLS_ROOT_DIR "${SPIRV_TOOLS_SOURCE_DIR}/../.." ABSOLUTE)
+        get_filename_component(SPIRV_TOOLS_ROOT_BINARY_DIR "${SPIRV_TOOLS_BINARY_DIR}/../.." ABSOLUTE)
+        target_include_directories(Diligent-ShaderTools PRIVATE 
+            ${SPIRV_TOOLS_ROOT_DIR}
+            ${SPIRV_TOOLS_ROOT_BINARY_DIR}
+        )
         target_compile_definitions(Diligent-ShaderTools PRIVATE USE_SPIRV_TOOLS=1)
     endif()
 
@@ -227,7 +238,7 @@ add_custom_command(OUTPUT ${HLSL_DEFINITIONS_INC} # We must use full path here!
                    VERBATIM
 )
 
-set_common_target_properties(Diligent-ShaderTools)
+set_common_target_properties(Diligent-ShaderTools 17)
 
 source_group("src" FILES ${SOURCE})
 source_group("include" FILES ${INCLUDE})

Graphics/ShaderTools/include/SPIRVTools.hpp

@@ -27,6 +27,7 @@
 #pragma once
 
 #include <vector>
+#include <string>
 
 #include "FlagEnum.h"
 
@@ -49,4 +50,14 @@ std::vector<uint32_t> OptimizeSPIRV(const std::vector<uint32_t>& SrcSPIRV,
                                     spv_target_env               TargetEnv,
                                     SPIRV_OPTIMIZATION_FLAGS     Passes);
 
+/// Converts a uniform buffer variable to a push constant in SPIR-V bytecode.
+/// This function modifies the storage class of the specified variable from Uniform to PushConstant,
+/// and removes Binding and DescriptorSet decorations.
+///
+/// \param [in] SPIRV      - Source SPIR-V bytecode
+/// \param [in] BlockName  - Name of the uniform buffer block to convert
+/// \return Modified SPIR-V bytecode, or empty vector on failure
+std::vector<uint32_t> PatchSPIRVConvertUniformBufferToPushConstant(const std::vector<uint32_t>& SPIRV,
+                                                                   const std::string&           BlockName);
+
 } // namespace Diligent