Move loop to check for single params into

legalizeEntryPointParameterForGLSL()

Author: mkeshavaNV

source/slang/slang-ir-glsl-legalize.cpp

@@ -2453,23 +2453,10 @@ void legalizeRayTracingEntryPointParameterForGLSL(
     GLSLLegalizationContext* context,
     IRFunc* func,
     IRParam* pp,
-    IRVarLayout* paramLayout)
+    IRVarLayout* paramLayout,
+    bool hasSingleOutOrInOutParam)
 {
-    auto firstBlock = func->getFirstBlock();
-
-    // Count the number of inout or out parameters
-    int inoutOrOutParamCount = 0;
-    for (auto _param = firstBlock->getFirstParam(); _param; _param = _param->getNextParam())
-    {
-        auto _paramType = _param->getDataType();
-        if (as<IROutType>(_paramType) || as<IRInOutType>(_paramType))
-        {
-            inoutOrOutParamCount++;
-        }
-    }
-
-    // If we have just one inout or out param, we don't need consolidation.
-    if (inoutOrOutParamCount <= 1)
+    if (hasSingleOutOrInOutParam)
     {
         handleSingleParam(context, func, pp, paramLayout);
         return;
@@ -3165,7 +3152,6 @@ void legalizeEntryPointParameterForGLSL(
         }
     }
 
-
     // We need to create a global variable that will replace the parameter.
     // It seems superficially obvious that the variable should have
     // the same type as the parameter.
@@ -3322,7 +3308,23 @@ void legalizeEntryPointParameterForGLSL(
     case Stage::Intersection:
     case Stage::Miss:
     case Stage::RayGeneration:
-        legalizeRayTracingEntryPointParameterForGLSL(context, func, pp, paramLayout);
+        {
+            // Count the number of inout or out parameters
+            int inoutOrOutParamCount = 0;
+            auto firstBlock = func->getFirstBlock();
+            for (auto _param = firstBlock->getFirstParam(); _param; _param = _param->getNextParam())
+            {
+                auto _paramType = _param->getDataType();
+                if (as<IROutType>(_paramType) || as<IRInOutType>(_paramType))
+                {
+                    inoutOrOutParamCount++;
+                }
+            }
+
+            // If we have just one inout or out param, we don't need consolidation.
+            bool hasSingleOutOrInOutParam = inoutOrOutParamCount <= 1;
+            legalizeRayTracingEntryPointParameterForGLSL(context, func, pp, paramLayout, hasSingleOutOrInOutParam);
+        }
         return;
     }