m91-b99622c05a-2 force MTLLanguageVersion2_0

HumbleUI · Apr 29, 2021 · 3c5d6bc · 3c5d6bc
1 parent f6b13d9
commit 3c5d6bc
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 25 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,8 +14,7 @@ on:
         default: 'false'
 
 env:
-  #version: m91-b99622c05a
-  version: m90-f1e4f21baf
+  version: m91-b99622c05a-2
 
 jobs:
   macos:

diff --git a/README.md b/README.md
@@ -8,26 +8,20 @@ Prebuilt binaries can be found [in releases](https://github.com/JetBrains/skia-b
 
 ## Building next version of Skia
 
-Update `skia_branch`, `skia_commit` and `release` in [.github/workflows/build.yml](https://github.com/JetBrains/skia-build/blob/master/.github/workflows/build.yml).
+Update `version` in [.github/workflows/build.yml](https://github.com/JetBrains/skia-build/blob/master/.github/workflows/build.yml).
 
 ## Building locally
 
 ```sh
-python3 script/checkout.py --version m89-19889d74fa
+python3 script/checkout.py --version m91-b99622c05a
 python3 script/build.py
 python3 script/archive.py
 ```
 
-More options can be specified for checkout:
-
-```sh
-python3 script/checkout.py [--version VERSION]
-```
-
 To build a debug build:
 
 ```sh
-python3 script/checkout.py --version m89-19889d74fa
+python3 script/checkout.py --version m91-b99622c05a
 python3 script/build.py --debug
 python3 script/archive.py --debug
 ```
diff --git a/patches/11145_BUILD.patch b/patches/11145_BUILD.patch
diff --git a/patches/GrMtlUtil.patch b/patches/GrMtlUtil.patch
@@ -0,0 +1,14 @@
+diff --git a/src/gpu/mtl/GrMtlUtil.mm b/src/gpu/mtl/GrMtlUtil.mm
+index 9d697bd79f..9711abdbf1 100644
+--- a/src/gpu/mtl/GrMtlUtil.mm
++++ b/src/gpu/mtl/GrMtlUtil.mm
+@@ -104,6 +104,9 @@ bool GrSkSLToMSL(const GrMtlGpu* gpu,
+     if (gpu->caps()->shaderCaps()->canUseFastMath()) {
+         options.fastMathEnabled = true;
+     }
++    if (@available(macOS 10.13, iOS 11.0, *)) {
++        options.languageVersion = MTLLanguageVersion2_0;
++    }
+
+     NSError* error = nil;
+ #if defined(SK_BUILD_FOR_MAC)
diff --git a/script/build.py b/script/build.py
@@ -31,7 +31,7 @@ def main():
     # 'skia_use_icu=true',
     'skia_use_system_icu=false',
     # 'skia_enable_skshaper=true',
-    'skia_enable_svg=true',
+    # 'skia_enable_svg=true',
     'skia_enable_skottie=true'
   ]
 
@@ -68,7 +68,7 @@ def main():
   gn = 'gn.exe' if 'windows' == system else 'gn'
   subprocess.check_call([os.path.join('bin', gn), 'gen', out, '--args=' + ' '.join(args)])
   ninja = 'ninja.exe' if 'windows' == system else 'ninja'
-  subprocess.check_call([os.path.join('..', 'depot_tools', ninja), '-C', out, 'skia', 'modules', 'modules/svg'])
+  subprocess.check_call([os.path.join('..', 'depot_tools', ninja), '-C', out, 'skia', 'modules'])
 
   return 0