Lazily initialize default shader library.

kakashidinho · Jul 31, 2020 · 277864a · 277864a
1 parent 274641f
commit 277864a
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/libANGLE/renderer/metal/DisplayMtl.h b/src/libANGLE/renderer/metal/DisplayMtl.h
@@ -109,7 +109,7 @@ class DisplayMtl : public DisplayImpl
     mtl::RenderUtils &getUtils() { return mUtils; }
     mtl::StateCache &getStateCache() { return mStateCache; }
 
-    id<MTLLibrary> getDefaultShadersLib() const { return mDefaultShaders; }
+    id<MTLLibrary> getDefaultShadersLib();
 
     id<MTLDepthStencilState> getDepthStencilState(const mtl::DepthStencilDesc &desc)
     {

diff --git a/src/libANGLE/renderer/metal/DisplayMtl.mm b/src/libANGLE/renderer/metal/DisplayMtl.mm
@@ -79,7 +79,6 @@ bool IsMetalDisplayAvailable()
         initializeFeatures();
 
         ANGLE_TRY(mFormatTable.initialize(this));
-        ANGLE_TRY(initializeShaderLibrary());
 
         return mUtils.initialize();
     }
@@ -744,6 +743,18 @@ bool IsMetalDisplayAvailable()
     return angle::Result::Continue;
 }
 
+id<MTLLibrary> DisplayMtl::getDefaultShadersLib()
+{
+    if (!mDefaultShaders)
+    {
+        if (initializeShaderLibrary() != angle::Result::Continue)
+        {
+            return nil;
+        }
+    }
+    return mDefaultShaders;
+}
+
 bool DisplayMtl::supportiOSGPUFamily(uint8_t iOSFamily) const
 {
 #if (!TARGET_OS_IOS && !TARGET_OS_TV) || TARGET_OS_MACCATALYST