Merge pull request #1 from hzqst/inline_constants_vktest

Inline constants vktest

Author: hzqst

Graphics/ShaderTools/src/ConvertUBOToPushConstant.cpp

@@ -214,11 +214,23 @@ class ConvertUBOToPushConstantPass : public spvtools::opt::Pass
             return Status::Failure;
         }
 
-        // Note: We don't need to manually reorder the pointer type instruction.
-        // SPIR-V does not require types to appear in any specific relative order,
-        // as long as they are valid type declarations. FindPointerToType handles
-        // type creation correctly, and the SPIRV-Tools framework manages instruction
-        // ordering appropriately.
+        // IMPORTANT: FindPointerToType() may create a new type instruction at the end of
+        // the types_values section. However, SPIR-V requires all IDs to be defined before
+        // use (SSA form). If the new pointer type was just created, it will appear AFTER
+        // the OpVariable that uses it, which violates SPIR-V validation rules.
+        //
+        // We need to move the newly created pointer type instruction to appear BEFORE
+        // the OpVariable instruction that will reference it.
+        spvtools::opt::Instruction* new_ptr_type_inst = get_def_use_mgr()->GetDef(new_ptr_type_id);
+        if (new_ptr_type_inst != nullptr && new_ptr_type_inst != ptr_type_inst)
+        {
+            // The new pointer type was created (not reused). Move it before the variable.
+            // In SPIR-V, types appear in the types_values section before variables.
+            // We insert the new type right after the original pointer type to maintain
+            // proper ordering within the types section.
+            new_ptr_type_inst->RemoveFromList();
+            new_ptr_type_inst->InsertAfter(ptr_type_inst);
+        }
 
         // Update the variable's type to the new pointer type
         target_var->SetResultType(new_ptr_type_id);
@@ -368,6 +380,17 @@ class ConvertUBOToPushConstantPass : public spvtools::opt::Pass
         uint32_t new_result_type_id =
             type_mgr->FindPointerToType(pointee_type_id, spv::StorageClass::PushConstant);
 
+        // If a new type was created, ensure it's properly positioned in the types section.
+        // FindPointerToType may append new types at the end, but they need to appear
+        // before any instructions that use them (SPIR-V SSA requirement).
+        spvtools::opt::Instruction* new_type_inst = get_def_use_mgr()->GetDef(new_result_type_id);
+        if (new_type_inst != nullptr && new_type_inst != result_type_inst)
+        {
+            // Move the new type to appear after the original type in the types section
+            new_type_inst->RemoveFromList();
+            new_type_inst->InsertAfter(result_type_inst);
+        }
+
         inst->SetResultType(new_result_type_id);
         context()->UpdateDefUse(inst);
     }

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