Refactor goto statement (#1799)

Refactoring Metal rendering code path to remove goto statement.
AcademySoftwareFoundation · May 1, 2024 · 19c0108 · 19c0108
1 parent fd5f66c
commit 19c0108
Showing 1 changed file with 13 additions and 18 deletions.
diff --git a/source/MaterialXRenderMsl/MslPipelineStateObject.mm b/source/MaterialXRenderMsl/MslPipelineStateObject.mm
@@ -1019,9 +1019,20 @@ int GetStrideOfMetalType(MTLDataType type)
                     continue;
                 }
 
-                int tries = 0;
                 auto inputIt = _uniformList.find(v->getVariable());
-try_again:      if (inputIt != _uniformList.end())
+                if (inputIt == _uniformList.end())
+                {
+                    if (v->getType() == Type::FILENAME)
+                    {
+                        inputIt = _uniformList.find(TEXTURE_NAME(v->getVariable()));
+                    }
+                    else
+                    {
+                        inputIt = _uniformList.find(uniforms.getInstance() + "." + v->getVariable());
+                    }
+                }
+
+                if (inputIt != _uniformList.end())
                 {
                     Input* input = inputIt->second.get();
                     input->path = v->getPath();
@@ -1043,22 +1054,6 @@ int GetStrideOfMetalType(MTLDataType type)
                         uniformTypeMismatchFound = true;
                     }
                 }
-                else
-                {
-                    if(tries == 0)
-                    {
-                        ++tries;
-                        if(v->getType() == Type::FILENAME)
-                        {
-                            inputIt = _uniformList.find(TEXTURE_NAME(v->getVariable()));
-                        }
-                        else
-                        {
-                            inputIt = _uniformList.find(uniforms.getInstance() + "." + v->getVariable());
-                        }
-                        goto try_again;
-                    }
-                }
             }
         }