SPIRVTools.hpp: remove dependency on libspirv.h

Author: TheMostDiligent

Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp

@@ -773,7 +773,7 @@ void PipelineStateVkImpl::RemapOrVerifyShaderResources(
                 {
                     OptimizationFlags |= SPIRV_OPTIMIZATION_FLAG_LEGALIZATION;
                 }
-                std::vector<uint32_t> StrippedSPIRV = OptimizeSPIRV(SPIRV, SPV_ENV_MAX, OptimizationFlags);
+                std::vector<uint32_t> StrippedSPIRV = OptimizeSPIRV(SPIRV, OptimizationFlags);
                 if (!StrippedSPIRV.empty())
                     SPIRV = std::move(StrippedSPIRV);
                 else

Graphics/GraphicsEngineVulkan/src/ShaderVkImpl.cpp

@@ -78,7 +78,7 @@ std::vector<uint32_t> CompileShaderDXC(const ShaderCreateInfo&         ShaderCI,
     {
         // SPIR-V bytecode generated from HLSL must be legalized to
         // turn it into a valid vulkan SPIR-V shader.
-        std::vector<uint32_t> LegalizedSPIRV = OptimizeSPIRV(SPIRV, SPV_ENV_MAX, SPIRV_OPTIMIZATION_FLAG_LEGALIZATION);
+        std::vector<uint32_t> LegalizedSPIRV = OptimizeSPIRV(SPIRV, SPIRV_OPTIMIZATION_FLAG_LEGALIZATION);
         if (!LegalizedSPIRV.empty())
             SPIRV = std::move(LegalizedSPIRV);
         else

Graphics/ShaderTools/include/SPIRVTools.hpp

@@ -31,8 +31,6 @@
 
 #include "FlagEnum.h"
 
-#include "spirv-tools/libspirv.h"
-
 namespace Diligent
 {
 
@@ -47,7 +45,10 @@ DEFINE_FLAG_ENUM_OPERATORS(SPIRV_OPTIMIZATION_FLAGS);
 
 
 std::vector<uint32_t> OptimizeSPIRV(const std::vector<uint32_t>& SrcSPIRV,
-                                    spv_target_env               TargetEnv,
+                                    int                          TargetEnv, // spv_target_env
+                                    SPIRV_OPTIMIZATION_FLAGS     Passes);
+
+std::vector<uint32_t> OptimizeSPIRV(const std::vector<uint32_t>& SrcSPIRV,
                                     SPIRV_OPTIMIZATION_FLAGS     Passes);
 
 /// Converts a uniform buffer variable to a push constant in SPIR-V bytecode.

Graphics/ShaderTools/src/GLSLangUtils.cpp

@@ -49,6 +49,7 @@
 #include "ShaderToolsCommon.hpp"
 #ifdef USE_SPIRV_TOOLS
 #    include "SPIRVTools.hpp"
+#    include "spirv-tools/libspirv.h"
 #endif
 
 // clang-format off

Graphics/ShaderTools/src/SPIRVTools.cpp

@@ -108,14 +108,14 @@ spv_target_env SpvTargetEnvFromSPIRV(const std::vector<uint32_t>& SPIRV)
 
 } // namespace SPIRVToolsInternal
 
-std::vector<uint32_t> OptimizeSPIRV(const std::vector<uint32_t>& SrcSPIRV, spv_target_env TargetEnv, SPIRV_OPTIMIZATION_FLAGS Passes)
+std::vector<uint32_t> OptimizeSPIRV(const std::vector<uint32_t>& SrcSPIRV, int TargetEnv, SPIRV_OPTIMIZATION_FLAGS Passes)
 {
     VERIFY_EXPR(Passes != SPIRV_OPTIMIZATION_FLAG_NONE);
 
     if (TargetEnv == SPV_ENV_MAX)
         TargetEnv = SPIRVToolsInternal::SpvTargetEnvFromSPIRV(SrcSPIRV);
 
-    spvtools::Optimizer SpirvOptimizer(TargetEnv);
+    spvtools::Optimizer SpirvOptimizer(static_cast<spv_target_env>(TargetEnv));
     SpirvOptimizer.SetMessageConsumer(SPIRVToolsInternal::SpvOptimizerMessageConsumer);
 
     spvtools::OptimizerOptions Options;
@@ -154,4 +154,10 @@ std::vector<uint32_t> OptimizeSPIRV(const std::vector<uint32_t>& SrcSPIRV, spv_t
     return OptimizedSPIRV;
 }
 
+std::vector<uint32_t> OptimizeSPIRV(const std::vector<uint32_t>& SrcSPIRV,
+                                    SPIRV_OPTIMIZATION_FLAGS     Passes)
+{
+    return OptimizeSPIRV(SrcSPIRV, SPV_ENV_MAX, Passes);
+}
+
 } // namespace Diligent

Tests/DiligentCoreTest/src/ShaderTools/SPIRVShaderResourcesTest.cpp

@@ -31,21 +31,14 @@
 #include "RefCntAutoPtr.hpp"
 #include "EngineMemory.h"
 #include "BasicFileSystem.hpp"
+#include "SPIRVTools.hpp"
 
 #include <unordered_map>
 #include <string>
 #include <vector>
 
 #include "TestingEnvironment.hpp"
 
-// Forward declaration for ConvertUBOToPushConstants from SPIRVTools.hpp
-// We cannot include SPIRVTools.hpp directly because it depends on spirv-tools headers
-namespace Diligent
-{
-std::vector<uint32_t> ConvertUBOToPushConstants(const std::vector<uint32_t>& SPIRV,
-                                                const std::string&           BlockName);
-}
-
 #include "gtest/gtest.h"
 
 using namespace Diligent;