We always need SPIRV-Tools to patch uniform buffer block, no matter NO_HLSL defined or not

Author: hzqst

Graphics/GraphicsEngineVulkan/src/PipelineStateVkImpl.cpp

@@ -43,17 +43,12 @@
 #include "EngineMemory.h"
 #include "StringTools.hpp"
 
-#if !DILIGENT_NO_HLSL
-#    include "SPIRVTools.hpp"
-#endif
+//We always need this to patch uniform buffer block, no matter DILIGENT_NO_HLSL defined or not.
+#include "SPIRVTools.hpp"
 
 namespace Diligent
 {
 
-//when DILIGENT_NO_HLSL not defined
-std::vector<uint32_t> PatchSPIRVConvertUniformBufferToPushConstant(const std::vector<uint32_t>& SPIRV,
-                                                                   const std::string&           BlockName);
-
 constexpr INTERFACE_ID PipelineStateVkImpl::IID_InternalImpl;
 
 namespace

Graphics/ShaderTools/CMakeLists.txt

@@ -106,7 +106,7 @@ if(DILIGENT_USE_SPIRV_TOOLCHAIN)
             set(USE_SPIRV_TOOLS TRUE)
         endif()
     endif()
-    if (NOT ${DILIGENT_NO_HLSL} AND TARGET SPIRV-Tools-opt)
+    if (TARGET SPIRV-Tools-opt) # NOT ${DILIGENT_NO_HLSL} AND -- we always need SPIRV-Tools.
         set(USE_SPIRV_TOOLS TRUE)
     endif()
 endif()