WIP: support building on M1 Mac

kakashidinho · May 8, 2021 · 43693c6 · 43693c6
1 parent 5dcbac4
commit 43693c6
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/DEPS b/DEPS
@@ -52,8 +52,8 @@ deps = {
     'condition': 'checkout_src_internal',
   },
 
-  '{angle_root}/build': {
-    'url': 'https://github.com/kakashidinho/chromium_build.git@7b75d3a6f831f97ede498ea40f3276db0d8f0171',
+  'build': {
+    'url': 'https://github.com/kakashidinho/chromium_build.git@bb60a97b5df3a8b26684b590f9411394d0a0affb',
     'condition': 'not build_with_chromium',
   },
 
@@ -201,12 +201,12 @@ deps = {
   },
 
   '{angle_root}/third_party/zlib': {
-    'url': '{chromium_git}/chromium/src/third_party/zlib@0044d0424c7f7d15436541ed1ecc89479b8bfda4',
+    'url': 'https://github.com/kakashidinho/chromium_zlib.git@1ddb00631d85db69d376c7359de3e2a5b9f193ec',
     'condition': 'not build_with_chromium',
   },
 
   '{angle_root}/tools/clang': {
-    'url': '{chromium_git}/chromium/src/tools/clang.git@d60a6a8084300eb8de99e56b559369dcde4cffa4',
+    'url': '{chromium_git}/chromium/src/tools/clang.git@6e92ef64604dcb6b4b2be4f29e4ba25e9f638116',
     'condition': 'not build_with_chromium',
   },
 

diff --git a/src/tests/deqp_support/deqp_gles2_test_expectations.txt b/src/tests/deqp_support/deqp_gles2_test_expectations.txt
@@ -449,4 +449,7 @@
 4235 METAL INTEL : dEQP-GLES2.functional.shaders.invariance.highp.loop_4 = FAIL
 4235 METAL INTEL : dEQP-GLES2.functional.shaders.invariance.mediump.loop_4 = FAIL
 4235 METAL INTEL : dEQP-GLES2.functional.shaders.invariance.lowp.loop_2 = FAIL
-4235 METAL INTEL : dEQP-GLES2.functional.shaders.invariance.lowp.loop_4 = FAIL
+4235 METAL INTEL : dEQP-GLES2.functional.shaders.invariance.lowp.loop_4 = FAIL
+
+// Crash on M1 Mac
+4235 METAL : dEQP-GLES2.functional.shaders.random.texture.vertex.1 = SKIP
diff --git a/src/tests/deqp_support/deqp_gles3_test_expectations.txt b/src/tests/deqp_support/deqp_gles3_test_expectations.txt
@@ -1522,3 +1522,6 @@
 4235 METAL : dEQP-GLES3.functional.texture.specification.texsubimage2d_depth.depth32f_stencil8 = FAIL
 4235 METAL : dEQP-GLES3.functional.texture.specification.texsubimage3d_depth.depth24_stencil8_2d_array = FAIL
 4235 METAL : dEQP-GLES3.functional.texture.specification.texsubimage3d_depth.depth32f_stencil8_2d_array = FAIL
+
+// Crash on M1 Mac
+4235 METAL : dEQP-GLES3.functional.shaders.random.texture.vertex.1 = SKIP
diff --git a/third_party/libpng/BUILD.gn b/third_party/libpng/BUILD.gn
@@ -24,9 +24,13 @@ static_library("libpng") {
     "src/pngwtran.c",
     "src/pngwutil.c",
   ]
+
+  cflags = [ "-DPNG_ARM_NEON_OPT=0" ]
+
   if (is_win) {
-    cflags = [ "/wd4028" ]
+    cflags += [ "/wd4028" ]
   }
+
   configs -= [ "//build/config/compiler:chromium_code" ]
   public_configs = [ ":libpng_config" ]
   deps = [