address Tex

Author: bob80905

include/dxc/HLSL/HLOperations.h

@@ -398,6 +398,10 @@ const unsigned kAnnotateHandleResourceTypeOpIdx = 3;
 const unsigned kTraceRayRayDescOpIdx = 7;
 const unsigned kTraceRayPayLoadOpIdx = 8;
 
+// AllocateRayQuery
+const unsigned kAllocateRayQueryRayFlagsIdx = 1;
+const unsigned kAllocateRayQueryRayQueryFlagsIdx = 2;
+
 // CallShader.
 const unsigned kCallShaderPayloadOpIdx = 2;
 

lib/HLSL/HLOperationLower.cpp

@@ -5674,16 +5674,20 @@ Value *TranslateAllocateRayQuery(CallInst *CI, IntrinsicOp IOP,
   DXASSERT(CI->getNumArgOperands() == 3,
            "hlopcode for allocaterayquery always expects 3 arguments");
 
-  llvm::Value *Arg = CI->getOperand(2);
+  llvm::Value *Arg =
+      CI->getArgOperand(HLOperandIndex::kAllocateRayQueryRayQueryFlagsIdx);
   llvm::ConstantInt *ConstVal = llvm::dyn_cast<llvm::ConstantInt>(Arg);
   DXASSERT(ConstVal,
            "2nd argument to allocaterayquery must always be a constant value");
   if (ConstVal->getValue().getZExtValue() != 0) {
-    Value *refArgs[3] = {nullptr, CI->getOperand(1), CI->getOperand(2)};
+    Value *refArgs[3] = {
+        nullptr, CI->getOperand(HLOperandIndex::kAllocateRayQueryRayFlagsIdx),
+        CI->getOperand(HLOperandIndex::kAllocateRayQueryRayQueryFlagsIdx)};
     opcode = OP::OpCode::AllocateRayQuery2;
     return TrivialDxilOperation(opcode, refArgs, helper.voidTy, CI, hlslOP);
   }
-  Value *refArgs[2] = {nullptr, CI->getOperand(1)};
+  Value *refArgs[2] = {
+      nullptr, CI->getOperand(HLOperandIndex::kAllocateRayQueryRayFlagsIdx)};
   return TrivialDxilOperation(opcode, refArgs, helper.voidTy, CI, hlslOP);
 }
 

tools/clang/test/CodeGenHLSL/allocateRayQuery2-lower.hlsl

@@ -0,0 +1,25 @@
+// RUN: %dxc -T lib_6_9 -fcgl %s | FileCheck %s 
+
+// CHECK: %"class.RayQuery<1024, 1>" = type { i32 }
+// CHECK: %"class.RayQuery<1, 0>" = type { i32 }
+
+
+
+
+RaytracingAccelerationStructure RTAS;
+// DXR entry point to ensure RDAT flags match during validation.
+[shader("vertex")]
+void main(RayDesc rayDesc : RAYDESC) {
+
+  // CHECK: alloca %"class.RayQuery<1024, 1>", align 4
+  // CHECK: alloca %"class.RayQuery<1, 0>", align 4
+
+  // CHECK: call i32 @"dx.hl.op..i32 (i32, i32, i32)"(i32 [[ARQ:[0-9]*]], i32 1024, i32 1)
+  RayQuery<RAY_FLAG_FORCE_OMM_2_STATE, RAYQUERY_FLAG_ALLOW_OPACITY_MICROMAPS> rayQuery1;
+
+  rayQuery1.TraceRayInline(RTAS, RAY_FLAG_FORCE_OMM_2_STATE, 2, rayDesc);
+
+  // CHECK: call i32 @"dx.hl.op..i32 (i32, i32, i32)"(i32 [[ARQ]], i32 1, i32 0)
+  RayQuery<RAY_FLAG_FORCE_OPAQUE> rayQuery2;
+  rayQuery2.TraceRayInline(RTAS, 0, 2, rayDesc);
+}

tools/clang/test/CodeGenHLSL/allocateRayQuery2.hlsl

@@ -5,12 +5,12 @@ RaytracingAccelerationStructure RTAS;
 [shader("vertex")]
 void main(RayDesc rayDesc : RAYDESC) {
 
-  // CHECK: call i32 @dx.op.allocateRayQuery2(i32 258, i32 1024, i32 1)  ; AllocateRayQuery2(constRayFlags,constRayQueryFlags)
+  // CHECK: call i32 @dx.op.allocateRayQuery2(i32 258, i32 1024, i32 1)
   RayQuery<RAY_FLAG_FORCE_OMM_2_STATE, RAYQUERY_FLAG_ALLOW_OPACITY_MICROMAPS> rayQuery1;
 
   rayQuery1.TraceRayInline(RTAS, RAY_FLAG_FORCE_OMM_2_STATE, 2, rayDesc);
 
-  // CHECK: call i32 @dx.op.allocateRayQuery(i32 178, i32 1)  ; AllocateRayQuery(constRayFlags)
+  // CHECK: call i32 @dx.op.allocateRayQuery(i32 178, i32 1)
   RayQuery<RAY_FLAG_FORCE_OPAQUE> rayQuery2;
   rayQuery2.TraceRayInline(RTAS, 0, 2, rayDesc);
 }