Add ConvertUBOToPushConstants and corresponding tests (#737)

Author: hzqst

Graphics/ShaderTools/CMakeLists.txt

@@ -117,6 +117,7 @@ if(ENABLE_SPIRV)
 
     if (${USE_SPIRV_TOOLS})
         list(APPEND SOURCE src/SPIRVTools.cpp)
+        list(APPEND SOURCE src/ConvertUBOToPushConstant.cpp)
         list(APPEND INCLUDE include/SPIRVTools.hpp)
     endif()
 
@@ -180,6 +181,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()
 

Graphics/ShaderTools/include/SPIRVTools.hpp

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019-2022 Diligent Graphics LLC
+ *  Copyright 2019-2025 Diligent Graphics LLC
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -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> ConvertUBOToPushConstants(const std::vector<uint32_t>& SPIRV,
+                                                const std::string&           BlockName);
+
 } // namespace Diligent