Update tools for spirv issue 373.

Author: alelenv

source/val/validate_ray_tracing_reorder.cpp

@@ -991,6 +991,16 @@ spv_result_t RayReorderEXTPass(ValidationState_t& _, const Instruction* inst) {
                << "Hit Object Attributes id must be a OpVariable of storage "
                   "class HitObjectAttributeEXT";
       }
+
+      // Validate optional Hit Kind (operand 4)
+      if (inst->operands().size() > 4) {
+        const uint32_t hit_kind_type = _.GetOperandTypeId(inst, 4);
+        if (!_.IsUnsignedIntScalarType(hit_kind_type) ||
+            _.GetBitWidth(hit_kind_type) != 32) {
+          return _.diag(SPV_ERROR_INVALID_DATA, inst)
+                 << "Hit Kind must be a 32-bit unsigned int scalar";
+        }
+      }
       break;
     }
 

test/val/val_ray_tracing_reorder_test.cpp

@@ -1447,7 +1447,8 @@ TEST_F(ValidateRayTracingReorderEXT,
   EXPECT_EQ(SPV_SUCCESS, ValidateInstructions(SPV_ENV_VULKAN_1_2));
 }
 
-TEST_F(ValidateRayTracingReorderEXT, HitObjectRecordFromQueryEXT) {
+TEST_F(ValidateRayTracingReorderEXT,
+       HitObjectRecordFromQueryEXTWithoutHitKind) {
   const std::string cap = R"(
                OpCapability RayQueryKHR
                             )";
@@ -1472,6 +1473,61 @@ TEST_F(ValidateRayTracingReorderEXT, HitObjectRecordFromQueryEXT) {
   EXPECT_EQ(SPV_SUCCESS, ValidateInstructions(SPV_ENV_VULKAN_1_2));
 }
 
+TEST_F(ValidateRayTracingReorderEXT,
+       HitObjectRecordFromQueryEXTWithHitKind) {
+  const std::string cap = R"(
+               OpCapability RayQueryKHR
+                            )";
+  const std::string extensions = R"(
+               OpExtension "SPV_KHR_ray_query"
+               )";
+  const std::string declarations = R"(
+        %uint = OpTypeInt 32 0
+        %uint_5 = OpConstant %uint 5
+        %uint_254 = OpConstant %uint 254
+        %rayquery_type = OpTypeRayQueryKHR
+        %_ptr_Function_rayquery = OpTypePointer Function %rayquery_type
+  )";
+
+  const std::string body = R"(
+      %ray_query = OpVariable %_ptr_Function_rayquery Function
+      OpHitObjectRecordFromQueryEXT %hObj %ray_query %uint_5 %attr %uint_254
+  )";
+
+  CompileSuccessfully(
+      GenerateReorderShaderCodeEXT(body, declarations, extensions, cap).c_str(),
+      SPV_ENV_VULKAN_1_2);
+  EXPECT_EQ(SPV_SUCCESS, ValidateInstructions(SPV_ENV_VULKAN_1_2));
+}
+
+TEST_F(ValidateRayTracingReorderEXT,
+       HitObjectRecordFromQueryEXTHitKindWrongType) {
+  const std::string cap = R"(
+               OpCapability RayQueryKHR
+                            )";
+  const std::string extensions = R"(
+               OpExtension "SPV_KHR_ray_query"
+               )";
+  const std::string declarations = R"(
+        %uint = OpTypeInt 32 0
+        %uint_5 = OpConstant %uint 5
+        %rayquery_type = OpTypeRayQueryKHR
+        %_ptr_Function_rayquery = OpTypePointer Function %rayquery_type
+  )";
+
+  const std::string body = R"(
+      %ray_query = OpVariable %_ptr_Function_rayquery Function
+      OpHitObjectRecordFromQueryEXT %hObj %ray_query %uint_5 %attr %float_1
+  )";
+
+  CompileSuccessfully(
+      GenerateReorderShaderCodeEXT(body, declarations, extensions, cap).c_str(),
+      SPV_ENV_VULKAN_1_2);
+  EXPECT_EQ(SPV_ERROR_INVALID_DATA, ValidateInstructions(SPV_ENV_VULKAN_1_2));
+  EXPECT_THAT(getDiagnosticString(),
+              HasSubstr("Hit Kind must be a 32-bit unsigned int scalar"));
+}
+
 TEST_F(ValidateRayTracingReorderEXT, HitObjectRecordMissMotionEXT) {
   const std::string declarations = R"(
          %uint = OpTypeInt 32 0