Fix deleted rayQueryHandle from HitObject_FromRayQuery from bad merge

Author: tex3d

include/dxc/DXIL/DxilInstructions.h

@@ -8949,12 +8949,19 @@ struct DxilInst_HitObject_FromRayQuery {
   // Validation support
   bool isAllowed() const { return true; }
   bool isArgumentListValid() const {
-    if (1 != llvm::dyn_cast<llvm::CallInst>(Instr)->getNumArgOperands())
+    if (2 != llvm::dyn_cast<llvm::CallInst>(Instr)->getNumArgOperands())
       return false;
     return true;
   }
   // Metadata
   bool requiresUniformInputs() const { return false; }
+  // Operand indexes
+  enum OperandIdx {
+    arg_rayQueryHandle = 1,
+  };
+  // Accessors
+  llvm::Value *get_rayQueryHandle() const { return Instr->getOperand(1); }
+  void set_rayQueryHandle(llvm::Value *val) { Instr->setOperand(1, val); }
 };
 
 /// This instruction Creates a new HitObject representing a committed hit from a

lib/DXIL/DxilOperations.cpp

@@ -5657,6 +5657,7 @@ Function *OP::GetOpFunc(OpCode opCode, Type *pOverloadType) {
   case OpCode::HitObject_FromRayQuery:
     A(pHit);
     A(pI32);
+    A(pI32);
     break;
   case OpCode::HitObject_FromRayQueryWithAttrs:
     A(pHit);

utils/hct/hctdb.py

@@ -5825,6 +5825,7 @@ def UFI(name, **mappings):
                 db_dxil_param(
                     0, "hit_object", "", "HitObject created from RayQuery object"
                 ),
+                db_dxil_param(2, "i32", "rayQueryHandle", "RayQuery handle"),
             ],
         )
         next_op_idx += 1