Modify RTBuilder functions to accept non-compile-time shader type

Modify RTBuilder functions to accept non-compile-time shader type

Author: jaladreips

IGC/AdaptorCommon/RayTracing/RTBuilder.cpp

@@ -888,7 +888,7 @@ Value* RTBuilder::getPrimitiveIndex(
     Value* ShaderTy,
     bool checkInstanceLeafPtr)
 {
-    if (checkInstanceLeafPtr)
+    if (checkInstanceLeafPtr && IGC_IS_FLAG_ENABLED(ForceRTCheckInstanceLeafPtr))
     {
         auto [ValidBB, PN] =
             validateInstanceLeafPtr(perLaneStackPtr, I, CreateICmpEQ(ShaderTy, getInt32(CallableShaderTypeMD::ClosestHit)));
@@ -904,30 +904,6 @@ Value* RTBuilder::getPrimitiveIndex(
     }
 }
 
-static Value* skipIfShaderIsNotHit(RTBuilder& IRB, Value* ShaderTy, std::function<Value* ()> Fn)
-{
-    auto* isHit = IRB.CreateOr({
-        IRB.CreateICmpEQ(ShaderTy, IRB.getInt32(CallableShaderTypeMD::ClosestHit)),
-        IRB.CreateICmpEQ(ShaderTy, IRB.getInt32(CallableShaderTypeMD::AnyHit)),
-        IRB.CreateICmpEQ(ShaderTy, IRB.getInt32(CallableShaderTypeMD::Intersection)),
-    });
-
-    auto [isHitBB, joinBB] = IRB.createTriangleFlow(isHit, &*IRB.GetInsertPoint(), VALUE_NAME("skipIfShaderIsNotHit_isHitBB"), VALUE_NAME("skipIfShaderIsNotHit_joinBB"));
-
-    IRB.SetInsertPoint(isHitBB);
-    auto* retV = Fn();
-
-    IRB.SetInsertPoint(isHitBB->getSinglePredecessor());
-    auto* defaultV = IRB.CreateZExtOrBitCast(IRB.getInt1(0), retV->getType());
-
-    IRB.SetInsertPoint(joinBB);
-    auto* phiV = IRB.CreatePHI(retV->getType(), 2);
-    phiV->addIncoming(retV, isHitBB);
-    phiV->addIncoming(defaultV, isHitBB->getSinglePredecessor());
-
-    return phiV;
-}
-
 Value* RTBuilder::getPrimitiveIndex(
     RTBuilder::StackPointerVal* perLaneStackPtr, Value* leafType, Value* ShaderTy)
 {
@@ -955,7 +931,7 @@ Value* RTBuilder::getGeometryIndex(
     Value* ShaderTy,
     bool checkInstanceLeafPtr)
 {
-    if (checkInstanceLeafPtr)
+    if (checkInstanceLeafPtr && IGC_IS_FLAG_ENABLED(ForceRTCheckInstanceLeafPtr))
     {
         auto [ValidBB, PN] =
             validateInstanceLeafPtr(perLaneStackPtr, I, CreateICmpEQ(ShaderTy, getInt32(CallableShaderTypeMD::ClosestHit)));