Roll angle-internal with new GLES 1.0 fixes.

DEPS

@@ -45,7 +45,7 @@ vars = {
 deps = {
 
   '{angle_root}/angle-internal': {
-    'url': 'https://chrome-internal.googlesource.com/angle/angle-internal.git@05522f9eb159afbbe35a246d5027893c56926a76',
+    'url': 'https://chrome-internal.googlesource.com/angle/angle-internal.git@15e655b1b2ef40622fef61cf7e74a95e3c71611f',
     'condition': 'checkout_src_internal',
   },
 

src/tests/BUILD.gn

@@ -307,6 +307,11 @@ if (build_angle_gles1_conform_tests) {
       "NULLWS",
     ]
 
+    # This is used by the tests to typedef uint32_t. For some reason only needed on mac.
+    if (is_mac) {
+      defines += [ "__linux" ]
+    }
+
     cflags = []
     if (is_clang) {
       # Remove when crbug.com/428099 is resolved.
@@ -322,6 +327,8 @@ if (build_angle_gles1_conform_tests) {
         # Upstream tests do null pointer arithmetic, so disable those warnings.
         "-Wno-null-pointer-arithmetic",
       ]
+    } else {
+      cflags += [ "/wd4101" ]  # unreferenced local variable
     }
   }
 

src/tests/gles1_conformance_tests/ConformanceTests.cpp

@@ -103,7 +103,9 @@ extern long TexCombineExec(void);
 extern long MatrixPaletteExec(void);
 
 // Test driver setup
-extern void ExtTestDriverSetup(void);
+void BufferSetup(void);
+void EpsilonSetup(void);
+void StateSetup(void);
 
 #define CONFORMANCE_TEST_ERROR (-1)
 
@@ -128,7 +130,12 @@ class GLES1ConformanceTest : public ANGLETest
         setConfigStencilBits(8);
     }
 
-    void testSetUp() override { ExtTestDriverSetup(); }
+    void testSetUp() override
+    {
+        BufferSetup();
+        EpsilonSetup();
+        StateSetup();
+    }
 };
 
 TEST_P(GLES1ConformanceTest, AmbLight)