Update lib/DxilValidation/DxilValidation.cpp

tex3d · llvm-beanz · web-flow · commit c089c58cfd8c · 2025-04-11T18:09:01.000-07:00
Co-authored-by: Chris B &lt;beanz@abolishcrlf.org&gt;
diff --git a/lib/DxilValidation/DxilValidation.cpp b/lib/DxilValidation/DxilValidation.cpp
@@ -1009,11 +1009,8 @@ static bool ValidateStorageMasks(Instruction *I, DXIL::OpCode Opcode,
 static void ValidateASHandle(CallInst *CI, Value *Hdl,
                              ValidationContext &ValCtx) {
   DxilResourceProperties RP = ValCtx.GetResourceFromVal(Hdl);
-  if (RP.getResourceClass() == DXIL::ResourceClass::Invalid) {
-    ValCtx.EmitInstrError(CI, ValidationRule::InstrResourceKindForTraceRay);
-    return;
-  }
-  if (RP.getResourceKind() != DXIL::ResourceKind::RTAccelerationStructure) {
+  if (RP.getResourceClass() == DXIL::ResourceClass::Invalid ||
+      RP.getResourceKind() != DXIL::ResourceKind::RTAccelerationStructure) {
     ValCtx.EmitInstrError(CI, ValidationRule::InstrResourceKindForTraceRay);
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -1009,11 +1009,8 @@ static bool ValidateStorageMasks(Instruction *I, DXIL::OpCode Opcode,`
`1009`	`1009`	`static void ValidateASHandle(CallInst CI, Value Hdl,`
`1010`	`1010`	`ValidationContext &ValCtx) {`
`1011`	`1011`	`DxilResourceProperties RP = ValCtx.GetResourceFromVal(Hdl);`
`1012`		`- if (RP.getResourceClass() == DXIL::ResourceClass::Invalid) {`
`1013`		`- ValCtx.EmitInstrError(CI, ValidationRule::InstrResourceKindForTraceRay);`
`1014`		`- return;`
`1015`		`- }`
`1016`		`- if (RP.getResourceKind() != DXIL::ResourceKind::RTAccelerationStructure) {`
	`1012`	`+ if (RP.getResourceClass() == DXIL::ResourceClass::Invalid \|\|`
	`1013`	`+ RP.getResourceKind() != DXIL::ResourceKind::RTAccelerationStructure) {`
`1017`	`1014`	`ValCtx.EmitInstrError(CI, ValidationRule::InstrResourceKindForTraceRay);`
`1018`	`1015`	`}`
`1019`	`1016`	`}`