1. moving patching logic to a separate cpp file: "SPIRVToolsConvertUBOToPushConstants.cpp"

2. rename "PatchSPIRVConvertUniformBufferToPushConstant" -> "ConvertUBOToPushConstants"

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/SPIRVToolsConvertUBOToPushConstants.cpp)
         list(APPEND INCLUDE include/SPIRVTools.hpp)
     endif()
 

Graphics/ShaderTools/include/SPIRVTools.hpp

@@ -57,7 +57,12 @@ std::vector<uint32_t> OptimizeSPIRV(const std::vector<uint32_t>& SrcSPIRV,
 /// \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,
+std::vector<uint32_t> ConvertUBOToPushConstants(const std::vector<uint32_t>& SPIRV,
                                                                    const std::string&           BlockName);
 
+/// @brief Get target environments from given SPIR-V
+/// @param [in] SPIRV       - Source SPIR-V bytecode
+/// @return spv_target_env
+spv_target_env SpvTargetEnvFromSPIRV(const std::vector<uint32_t>& SPIRV);
+
 } // namespace Diligent