Done legalized SPIR-V bytecode

Author: hzqst

Tests/DiligentCoreAPITest/CMakeLists.txt

@@ -151,6 +151,21 @@ if(EXISTS "${DILIGENT_NVAPI_PATH}/nvapi.h")
     target_compile_definitions(DiligentCoreAPITest PUBLIC DILIGENT_ENABLE_D3D_NVAPI)
 endif()
 
+# Add SPIRV-Tools include directories if needed for SPIRVTools.hpp
+# Test files that include SPIRVTools.hpp need access to spirv-tools headers
+# SPIRVTools.hpp includes "spirv-tools/libspirv.h", so we need the include directory
+if (TARGET SPIRV-Tools-opt)
+    get_target_property(SPIRV_TOOLS_SOURCE_DIR SPIRV-Tools-opt SOURCE_DIR)
+    get_target_property(SPIRV_TOOLS_BINARY_DIR SPIRV-Tools-opt BINARY_DIR)
+    get_filename_component(SPIRV_TOOLS_ROOT_DIR "${SPIRV_TOOLS_SOURCE_DIR}/../.." ABSOLUTE)
+    get_filename_component(SPIRV_TOOLS_ROOT_BINARY_DIR "${SPIRV_TOOLS_BINARY_DIR}/../.." ABSOLUTE)
+    # Add include subdirectory for public headers like spirv-tools/libspirv.h
+    target_include_directories(DiligentCoreAPITest PRIVATE 
+        ${SPIRV_TOOLS_ROOT_DIR}/include
+        ${SPIRV_TOOLS_ROOT_DIR}
+        ${SPIRV_TOOLS_ROOT_BINARY_DIR}
+    )
+endif()
 
 set_target_properties(DiligentCoreAPITest
 PROPERTIES

Tests/DiligentCoreAPITest/src/Vulkan/VkConvertUBOToPushConstantsTest.cpp

@@ -276,12 +276,7 @@ std::vector<unsigned int> LoadSPIRVFromHLSL(const std::string& ShaderSource,
         SPIRV = GLSLangUtils::HLSLtoSPIRV(ShaderCI, GLSLangUtils::SpirvVersion::Vk100, nullptr, nullptr);
     }
 
-    // SPIR-V bytecode generated from HLSL must be legalized to
-    // turn it into a valid vulkan SPIR-V shader.
-    SPIRV_OPTIMIZATION_FLAGS OptimizationFlags = SPIRV_OPTIMIZATION_FLAG_LEGALIZATION;
-    std::vector<uint32_t> LegalizedSPIRV = OptimizeSPIRV(SPIRV, SPV_ENV_MAX, OptimizationFlags);
-
-    return LegalizedSPIRV;
+    return SPIRV;
 }
 
 std::vector<unsigned int> LoadSPIRVFromGLSL(const std::string& ShaderSource, SHADER_TYPE ShaderType = SHADER_TYPE_PIXEL)
@@ -565,6 +560,15 @@ void RunConvertUBOToPushConstantsTest(SHADER_COMPILER Compiler, SHADER_SOURCE_LA
     std::vector<uint32_t> FS_SPIRV_Patched = ConvertUBOToPushConstants(FS_SPIRV, BlockName);
     ASSERT_FALSE(FS_SPIRV_Patched.empty()) << "Failed to patch UBO to push constants with BlockName: " << BlockName;
 
+    if (SourceLanguage == SHADER_SOURCE_LANGUAGE_HLSL)
+    {
+        // SPIR-V bytecode generated from HLSL must be legalized to
+        // turn it into a valid vulkan SPIR-V shader.
+        SPIRV_OPTIMIZATION_FLAGS OptimizationFlags = SPIRV_OPTIMIZATION_FLAG_LEGALIZATION | SPIRV_OPTIMIZATION_FLAG_STRIP_REFLECTION;
+        VS_SPIRV                                   = OptimizeSPIRV(VS_SPIRV, SPV_ENV_MAX, OptimizationFlags);
+        FS_SPIRV_Patched                           = OptimizeSPIRV(FS_SPIRV_Patched, SPV_ENV_MAX, OptimizationFlags);
+    }
+
     // Step 4: Create renderer with patched shaders
     PatchedPushConstantsRenderer Renderer{
         pSwapChain,