Fix ConvertUBOToPushConstant.cpp:46:6: error: function 'Diligent::(anonymous namespace)::SpvOptimizerMessageConsumer' has internal linkage but is not defined

Author: hzqst

Graphics/ShaderTools/include/SPIRVTools.hpp

@@ -60,9 +60,4 @@ std::vector<uint32_t> OptimizeSPIRV(const std::vector<uint32_t>& SrcSPIRV,
 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

Graphics/ShaderTools/src/ConvertUBOToPushConstant.cpp

@@ -40,15 +40,19 @@
 namespace Diligent
 {
 
-namespace
+namespace SPIRVToolsUtil
 {
 
+//Forward declaration
 void SpvOptimizerMessageConsumer(
     spv_message_level_t level,
     const char* /* source */,
     const spv_position_t& /* position */,
     const char* message);
 
+//Forward declaration
+spv_target_env SpvTargetEnvFromSPIRV(const std::vector<uint32_t>& SPIRV);
+
 // A pass that converts a uniform buffer variable to a push constant.
 // This pass:
 // 1. Finds the variable with the specified block name
@@ -388,11 +392,11 @@ std::vector<uint32_t> ConvertUBOToPushConstants(
     const std::vector<uint32_t>& SPIRV,
     const std::string&           BlockName)
 {
-    spv_target_env TargetEnv = SpvTargetEnvFromSPIRV(SPIRV);
+    spv_target_env TargetEnv = SPIRVToolsUtil::SpvTargetEnvFromSPIRV(SPIRV);
 
     spvtools::Optimizer optimizer(TargetEnv);
 
-    optimizer.SetMessageConsumer(SpvOptimizerMessageConsumer);
+    optimizer.SetMessageConsumer(SPIRVToolsUtil::SpvOptimizerMessageConsumer);
 
     // Register the pass to convert UBO to push constant using custom out-of-tree pass
     optimizer.RegisterPass(spvtools::Optimizer::PassToken(

Graphics/ShaderTools/src/SPIRVTools.cpp

@@ -32,7 +32,7 @@
 namespace Diligent
 {
 
-namespace
+namespace SPIRVToolsUtil
 {
 
 void SpvOptimizerMessageConsumer(
@@ -106,16 +106,18 @@ spv_target_env SpvTargetEnvFromSPIRV(const std::vector<uint32_t>& SPIRV)
     }
 }
 
+} // namespace SPIRVToolsUtil
+
 #undef SPV_SPIRV_VERSION_WORD
 std::vector<uint32_t> OptimizeSPIRV(const std::vector<uint32_t>& SrcSPIRV, spv_target_env TargetEnv, SPIRV_OPTIMIZATION_FLAGS Passes)
 {
     VERIFY_EXPR(Passes != SPIRV_OPTIMIZATION_FLAG_NONE);
 
     if (TargetEnv == SPV_ENV_MAX)
-        TargetEnv = SpvTargetEnvFromSPIRV(SrcSPIRV);
+        TargetEnv = SPIRVToolsUtil::SpvTargetEnvFromSPIRV(SrcSPIRV);
 
     spvtools::Optimizer SpirvOptimizer(TargetEnv);
-    SpirvOptimizer.SetMessageConsumer(SpvOptimizerMessageConsumer);
+    SpirvOptimizer.SetMessageConsumer(SPIRVToolsUtil::SpvOptimizerMessageConsumer);
 
     spvtools::OptimizerOptions Options;
 #ifndef DILIGENT_DEVELOPMENT
@@ -153,6 +155,4 @@ std::vector<uint32_t> OptimizeSPIRV(const std::vector<uint32_t>& SrcSPIRV, spv_t
     return OptimizedSPIRV;
 }
 
-} // namespace
-
 } // namespace Diligent