Metal: Compile default shader source files separately.

scripts/code_generation_hashes/Metal_default_shaders.json

 {
   "src/libANGLE/renderer/metal/shaders/blit.metal":
-    "1a12b22f56799bd38cf1c6b301b720ee",
+    "8a00929424273e07e4b63d4ab062f005",
   "src/libANGLE/renderer/metal/shaders/clear.metal":
     "1c231afc6100433a79fce49046aa5965",
   "src/libANGLE/renderer/metal/shaders/common.h":
-    "7330bd3f7ab21214e4fe16bc526749bb",
-  "src/libANGLE/renderer/metal/shaders/compiled/mtl_default_shaders.inc":
-    "445538e99fb3679c3c8436f565911c69",
+    "7f4fe9c0ee3fa9bee84ea6627df44e04",
+  "src/libANGLE/renderer/metal/shaders/compiled/mtl_default_shaders_autogen.inc":
+    "e244973f2fada4861373fbbf36be5d33",
   "src/libANGLE/renderer/metal/shaders/constants.h":
     "9bb6e63bf2b48a7a56978c787bde4850",
   "src/libANGLE/renderer/metal/shaders/gen_indices.metal":
     "002511e2b980a7fca7e80cbda6a82712",
   "src/libANGLE/renderer/metal/shaders/gen_mtl_internal_shaders.py":
-    "0e599fb113dbc3f714291383d85c39c2",
-  "src/libANGLE/renderer/metal/shaders/master_source.metal":
-    "fbe6f4bfb49a48ae87791a4cff5fab0a",
-  "src/libANGLE/renderer/metal/shaders/mtl_default_shaders_src_autogen.inc":
-    "ee7ff414da20e7b84f1187d2bea1e84d"
+    "a17189e67fe112942926902691de1539"
 }
\ No newline at end of file

src/libANGLE/renderer/metal/BUILD.gn

@@ -54,9 +54,8 @@ _metal_backend_sources = [
   "mtl_state_cache.mm",
   "mtl_utils.h",
   "mtl_utils.mm",
-  "shaders/compiled/mtl_default_shaders.inc",
+  "shaders/compiled/mtl_default_shaders_autogen.inc",
   "shaders/constants.h",
-  "shaders/mtl_default_shaders_src_autogen.inc",
 ]
 
 config("angle_metal_backend_config") {

src/libANGLE/renderer/metal/DisplayMtl.mm

@@ -15,8 +15,7 @@
 #include "libANGLE/renderer/metal/ContextMtl.h"
 #include "libANGLE/renderer/metal/SurfaceMtl.h"
 #include "libANGLE/renderer/metal/mtl_common.h"
-#include "libANGLE/renderer/metal/shaders/compiled/mtl_default_shaders.inc"
-#include "libANGLE/renderer/metal/shaders/mtl_default_shaders_src_autogen.inc"
+#include "libANGLE/renderer/metal/shaders/compiled/mtl_default_shaders_autogen.inc"
 #include "platform/Platform.h"
 
 #include "EGL/eglext.h"
@@ -666,14 +665,20 @@ angle::Result DisplayMtl::initializeShaderLibrary()
 {
     mtl::AutoObjCObj<NSError> err = nil;
 
-#if defined(ANGLE_MTL_DEBUG_INTERNAL_SHADERS)
-    mDefaultShaders = CreateShaderLibrary(getMetalDevice(), default_metallib_src,
-                                          sizeof(default_metallib_src), &err);
+    const uint8_t *compiled_shader_binary;
+    size_t compiled_shader_binary_len;
+
+#if !defined(NDEBUG)
+    compiled_shader_binary     = compiled_default_metallib_debug;
+    compiled_shader_binary_len = compiled_default_metallib_debug_len;
 #else
-    mDefaultShaders = CreateShaderLibraryFromBinary(getMetalDevice(), compiled_default_metallib,
-                                                    compiled_default_metallib_len, &err);
+    compiled_shader_binary                              = compiled_default_metallib;
+    compiled_shader_binary_len                          = compiled_default_metallib_len;
 #endif
 
+    mDefaultShaders = CreateShaderLibraryFromBinary(getMetalDevice(), compiled_shader_binary,
+                                                    compiled_shader_binary_len, &err);
+
     if (err && !mDefaultShaders)
     {
         ANGLE_MTL_OBJC_SCOPE

src/libANGLE/renderer/metal/shaders/blit.metal

@@ -9,10 +9,9 @@
 
 using namespace rx::mtl_shader;
 
-// function_constant(0-3) is already used by gen_indices.metal
-constant bool kPremultiplyAlpha [[function_constant(4)]];
-constant bool kUnmultiplyAlpha [[function_constant(5)]];
-constant int kSourceTextureType [[function_constant(6)]];   // Source texture type.
+constant bool kPremultiplyAlpha [[function_constant(1)]];
+constant bool kUnmultiplyAlpha [[function_constant(2)]];
+constant int kSourceTextureType [[function_constant(3)]];   // Source texture type.
 constant bool kSourceTextureType2D      = kSourceTextureType == kTextureType2D;
 constant bool kSourceTextureType2DArray = kSourceTextureType == kTextureType2DArray;
 constant bool kSourceTextureType2DMS    = kSourceTextureType == kTextureType2DMultisample;

src/libANGLE/renderer/metal/shaders/common.h

@@ -26,8 +26,4 @@ using namespace metal;
 // Full screen triangle's vertices
 constant float2 gCorners[3] = {float2(-1.0f, -1.0f), float2(3.0f, -1.0f), float2(-1.0f, 3.0f)};
 
-fragment float4 dummyFS()
-{
-    return float4(0, 0, 0, 0);
-}
 #endif /* LIBANGLE_RENDERER_METAL_SHADERS_COMMON_H_ */

src/libANGLE/renderer/metal/shaders/master_source.metal

-//
-// Copyright 2019 The ANGLE Project. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-//
-// master_source.metal:
-//    Includes all other metal source code in one file.
-
-#include "clear.metal"
-#include "blit.metal"
-#include "gen_indices.metal"