We don't need TargetEnv in PatchSPIRVConvertUniformBufferToPushConstant

Author: hzqst

Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp

@@ -1032,7 +1032,6 @@ void PipelineStateVkImpl::PatchShaderConvertUniformBufferToPushConstant(const Pu
 
                 std::vector<uint32_t> PatchedSPIRV = PatchSPIRVConvertUniformBufferToPushConstant(
                     SPIRV,
-                    SPV_ENV_MAX, // Auto-detect target environment
                     PushConstantName);
 
                 if (!PatchedSPIRV.empty())

Graphics/ShaderTools/include/SPIRVTools.hpp

@@ -55,11 +55,9 @@ std::vector<uint32_t> OptimizeSPIRV(const std::vector<uint32_t>& SrcSPIRV,
 /// and removes Binding and DescriptorSet decorations.
 ///
 /// \param [in] SPIRV      - Source SPIR-V bytecode
-/// \param [in] TargetEnv  - Target SPIR-V environment (use SPV_ENV_MAX to auto-detect)
 /// \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,
-                                                                   spv_target_env               TargetEnv,
                                                                    const std::string&           BlockName);
 
 } // namespace Diligent

Graphics/ShaderTools/src/SPIRVTools.cpp

@@ -512,8 +512,7 @@ std::vector<uint32_t> PatchSPIRVConvertUniformBufferToPushConstant(
     spv_target_env               TargetEnv,
     const std::string&           BlockName)
 {
-    if (TargetEnv == SPV_ENV_MAX)
-        TargetEnv = SpvTargetEnvFromSPIRV(SPIRV);
+    spv_target_env TargetEnv = SpvTargetEnvFromSPIRV(SPIRV);
 
     spvtools::Optimizer optimizer(TargetEnv);