Metal: GpuProgram - entrypoint cannot be main & some robustness

Joilnen · Oct 20, 2023 · d01d4cb · d01d4cb
1 parent 029de78
commit d01d4cb
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/RenderSystems/Metal/src/OgreMetalProgram.mm b/RenderSystems/Metal/src/OgreMetalProgram.mm
@@ -84,6 +84,7 @@ of this software and associated documentation files (the "Software"), to deal
                                             PT_STRING),&msCmdShaderReflectionPairHint);
         }
         mTargetBufferName = "";
+        mEntryPoint = "mainfunc"; // 1.4.4: A Metal function cannot be called main.
     }
     //---------------------------------------------------------------------------
     MetalProgram::~MetalProgram()
@@ -284,6 +285,10 @@ of this software and associated documentation files (the "Software"), to deal
                              "MetalProgram::analyzeRenderParameters" );
             }
             shader->load();
+
+            if(shader->hasCompileError())
+                return;
+
             assert( dynamic_cast<MetalProgram*>( shader->_getBindingDelegate() ) );
             MetalProgram *vertexShader = static_cast<MetalProgram*>( shader->_getBindingDelegate() );
             autoFillDummyVertexAttributesForShader( vertexShader->getMetalFunction(), psd );
@@ -430,13 +435,11 @@ of this software and associated documentation files (the "Software"), to deal
 
         if( mType != GPT_COMPUTE_PROGRAM )
         {
-            //You think this is a code smell? How about making BUILDconstantDefinitions const???
-            //It's an oxymoron.
-            const_cast<MetalProgram*>(this)->analyzeRenderParameters();
+            analyzeRenderParameters();
         }
         else
         {
-            const_cast<MetalProgram*>(this)->analyzeComputeParameters();
+            analyzeComputeParameters();
         }
 
         mLogicalToPhysical.reset(); // disallow access by index for now