Merge pull request #19 from bruvzg/ch_7577

Update Angle to chromium/7578

.github/workflows/ci.yaml

@@ -14,8 +14,8 @@ jobs:
         # macOS and iOS
         - name: 🍎 macOS x86_64
           platform: macos
-          os: macos-13
-          xcode: "15.0"
+          os: macos-latest
+          xcode: "26.1.1"
           artifact-name: godot-angle-static-x86_64-macos-release
           artifact-path-angle: bin/libANGLE.macos.x86_64.a
           artifact-path-egl: bin/libEGL.macos.x86_64.a
@@ -24,8 +24,8 @@ jobs:
 
         - name: 🍎 macOS arm64
           platform: macos
-          os: macos-13
-          xcode: "15.0"
+          os: macos-latest
+          xcode: "26.1.1"
           artifact-name: godot-angle-static-arm64-macos-release
           artifact-path-angle: bin/libANGLE.macos.arm64.a
           artifact-path-egl: bin/libEGL.macos.arm64.a
@@ -34,8 +34,8 @@ jobs:
 
         - name: 🍏 iOS x86_64 simulator
           platform: ios
-          os: macos-13
-          xcode: "15.0"
+          os: macos-latest
+          xcode: "26.1.1"
           artifact-name: godot-angle-static-x86_64-ios-sim-release
           artifact-path-angle: bin/libANGLE.ios.x86_64.simulator.a
           artifact-path-egl: bin/libEGL.ios.x86_64.simulator.a
@@ -44,8 +44,8 @@ jobs:
 
         - name: 🍏 iOS arm64 simulator
           platform: ios
-          os: macos-13
-          xcode: "15.0"
+          os: macos-latest
+          xcode: "26.1.1"
           artifact-name: godot-angle-static-arm64-ios-sim-release
           artifact-path-angle: bin/libANGLE.ios.arm64.simulator.a
           artifact-path-egl: bin/libEGL.ios.arm64.simulator.a
@@ -54,8 +54,8 @@ jobs:
 
         - name: 🍏 iOS arm64 device
           platform: ios
-          os: macos-13
-          xcode: "15.0"
+          os: macos-latest
+          xcode: "26.1.1"
           artifact-name: godot-angle-static-arm64-ios-release
           artifact-path-angle: bin/libANGLE.ios.arm64.a
           artifact-path-egl: bin/libEGL.ios.arm64.a
@@ -65,7 +65,7 @@ jobs:
         # MinGW/LLVM libs using UCRT
         - name: 🏁 Windows - MinGW/LLVM (UCRT) x86_64
           platform: windows
-          os: windows-2019
+          os: windows-2025
           artifact-name: godot-angle-static-x86_64-llvm-release
           artifact-path-angle: bin/libANGLE.windows.x86_64.a
           artifact-path-egl: bin/libEGL.windows.x86_64.a
@@ -75,7 +75,7 @@ jobs:
 
         - name: 🏁 Windows - MinGW/LLVM (UCRT) x86_32
           platform: windows
-          os: windows-2019
+          os: windows-2025
           artifact-name: godot-angle-static-x86_32-llvm-release
           artifact-path-angle: bin/libANGLE.windows.x86_32.a
           artifact-path-egl: bin/libEGL.windows.x86_32.a
@@ -85,7 +85,7 @@ jobs:
 
         - name: 🏁 Windows - MinGW/LLVM (UCRT) arm64
           platform: windows
-          os: windows-2019
+          os: windows-2025
           artifact-name: godot-angle-static-arm64-llvm-release
           artifact-path-angle: bin/libANGLE.windows.arm64.a
           artifact-path-egl: bin/libEGL.windows.arm64.a
@@ -96,7 +96,7 @@ jobs:
         # MSVC libs
         - name: 🏁 Windows - MSVC x86_64
           platform: windows
-          os: windows-2019
+          os: windows-2025
           artifact-name: godot-angle-static-x86_64-msvc-release
           artifact-path-angle: bin/libANGLE.windows.x86_64.lib
           artifact-path-egl: bin/libEGL.windows.x86_64.lib
@@ -105,7 +105,7 @@ jobs:
 
         - name: 🏁 Windows - MSVC x86_32
           platform: windows
-          os: windows-2019
+          os: windows-2025
           artifact-name: godot-angle-static-x86_32-msvc-release
           artifact-path-angle: bin/libANGLE.windows.x86_32.lib
           artifact-path-egl: bin/libEGL.windows.x86_32.lib
@@ -114,38 +114,63 @@ jobs:
 
         - name: 🏁 Windows - MSVC arm64
           platform: windows
-          os: windows-2019
+          os: windows-2025
           artifact-name: godot-angle-static-arm64-msvc-release
           artifact-path-angle: bin/libANGLE.windows.arm64.lib
           artifact-path-egl: bin/libEGL.windows.arm64.lib
           artifact-path-gles: bin/libGLES.windows.arm64.lib
           flags: use_mingw=no arch=arm64
 
-        # MinGW/GCC libs using MSVCRT
+        # MinGW/GCC libs using MSVCRT (MinGW 15 / CRT 13)
         - name: 🏁 Windows - MinGW/GCC (MSVCRT) x86_64
           platform: windows
-          os: windows-2019
-          artifact-name: godot-angle-static-x86_64-gcc-release
+          os: windows-2025
+          artifact-name: godot-angle-static-x86_64-gcc-13-release
           artifact-path-angle: bin/libANGLE.windows.x86_64.a
           artifact-path-egl: bin/libEGL.windows.x86_64.a
           artifact-path-gles: bin/libGLES.windows.x86_64.a
-          flags: use_mingw=yes arch=x86_64
+          flags: use_mingw=yes arch=x86_64 mingw_prefix=C:/mingw64
           mingw: yes
           msys: mingw64
           msysenv: x86_64
 
         - name: 🏁 Windows - MinGW/GCC (MSVCRT) x86_32
           platform: windows
-          os: windows-2019
-          artifact-name: godot-angle-static-x86_32-gcc-release
+          os: windows-2025
+          artifact-name: godot-angle-static-x86_32-gcc-13-release
           artifact-path-angle: bin/libANGLE.windows.x86_32.a
           artifact-path-egl: bin/libEGL.windows.x86_32.a
           artifact-path-gles: bin/libGLES.windows.x86_32.a
-          flags: use_mingw=yes arch=x86_32
+          flags: use_mingw=yes arch=x86_32 mingw_prefix=C:/mingw32
           mingw: yes
           msys: mingw32
           msysenv: i686
 
+        # MinGW/GCC libs using MSVCRT (MinGW 14 / CRT 12)
+        - name: 🏁 Windows - MinGW/GCC (MSVCRT) x86_64
+          platform: windows
+          os: windows-2022
+          artifact-name: godot-angle-static-x86_64-gcc-release
+          artifact-path-angle: bin/libANGLE.windows.x86_64.a
+          artifact-path-egl: bin/libEGL.windows.x86_64.a
+          artifact-path-gles: bin/libGLES.windows.x86_64.a
+          flags: use_mingw=yes arch=x86_64 mingw_prefix=C:/mingw64
+          mingw: yes
+          msys: mingw64
+          msysenv: x86_64
+
+        - name: 🏁 Windows - MinGW/GCC (MSVCRT) x86_32
+          platform: windows
+          os: windows-2022
+          artifact-name: godot-angle-static-x86_32-gcc-release
+          artifact-path-angle: bin/libANGLE.windows.x86_32.a
+          artifact-path-egl: bin/libEGL.windows.x86_32.a
+          artifact-path-gles: bin/libGLES.windows.x86_32.a
+          flags: use_mingw=yes arch=x86_32 mingw_prefix=C:/mingw32
+          mingw: yes
+          msys: mingw32
+          msysenv: i686
+  
     runs-on: ${{ matrix.os }}
 
     env:
@@ -165,10 +190,9 @@ jobs:
         if: ${{ matrix.platform == 'macos' || matrix.platform == 'ios' }}
         run: sudo xcode-select -switch "${XCODE_DEV_PATH}"
 
-      - name: Install SCons (Native env)
-        if: ${{ matrix.mingw != 'yes' }}
+      - name: Install SCons
         run: |
-          python -m pip install scons==4.0.0
+          python -m pip install scons==4.9.0
 
       - name: Install mako
         run: |
@@ -177,33 +201,24 @@ jobs:
       - name: Setup MinGW/LLVM
         if: ${{ matrix.platform == 'windows' && matrix.llvm == 'yes' }}
         run: |
-          curl -L -O https://github.com/mstorsjo/llvm-mingw/releases/download/20240619/llvm-mingw-20240619-ucrt-x86_64.zip
+          curl -L -O https://github.com/mstorsjo/llvm-mingw/releases/download/20250114/llvm-mingw-20250114-ucrt-x86_64.zip
           unzip -q llvm-mingw-*.zip
           rm llvm-mingw-*.zip
           mv llvm-mingw-* "$HOME/llvm-mingw"
           echo "$HOME/llvm-mingw/bin" >> $GITHUB_PATH
 
-      - name: Setup MinGW/MSYS2
+      - name: Setup MinGW path
         if: ${{ matrix.mingw == 'yes' }}
-        uses: msys2/setup-msys2@v2
-        with:
-          update: true
-          msystem: ${{matrix.msys}}
-          install: mingw-w64-${{matrix.msysenv}}-gcc mingw-w64-${{matrix.msysenv}}-scons
+        shell: bash
+        run: |
+          echo "C:/mingw32/bin" >> $GITHUB_PATH
 
       - name: Prepare ANGLE source
         shell: bash
         run: |
           ./update_angle.sh
 
-      - name: Build ANGLE (Native env)
-        if: ${{ matrix.mingw != 'yes' }}
-        run: |
-          scons platform=${{ matrix.platform }} ${{ matrix.flags }} optimize=speed
-
-      - name: Build ANGLE (MSYS2 env)
-        if: ${{ matrix.mingw == 'yes' }}
-        shell: msys2 {0}
+      - name: Build ANGLE
         run: |
           scons platform=${{ matrix.platform }} ${{ matrix.flags }} optimize=speed
 

.gitmodules

@@ -1,7 +1,7 @@
 [submodule "angle"]
 	path = angle
 	url = https://chromium.googlesource.com/angle/angle
-	branch = chromium/6601
+	branch = chromium/7578
 [submodule "third_party/astc-encoder/src"]
 	path = third_party/astc-encoder/src
 	url = https://chromium.googlesource.com/external/github.com/ARM-software/astc-encoder

SConstruct

@@ -173,8 +173,27 @@ if env["platform"] == "macos":
         env.Append(CCFLAGS=["-mmacosx-version-min=10.13"])
         env.Append(LINKFLAGS=["-mmacosx-version-min=10.13"])
 elif env["platform"] == "windows":
-    env.AppendUnique(CPPDEFINES=["WINVER=0x0603", "_WIN32_WINNT=0x0603"])
+    env.AppendUnique(CPPDEFINES=["WINVER=0x0A00", "_WIN32_WINNT=0x0A00"])
 
+if env["arch"] == "x86_64":
+    # On 64-bit x86, enable SSE 4.2 and prior instruction sets (SSE3/SSSE3/SSE4/SSE4.1) to improve performance.
+    # This is supported on most CPUs released after 2009-2011 (Intel Nehalem, AMD Bulldozer).
+    # AVX and AVX2 aren't enabled because they aren't available on more recent low-end Intel CPUs.
+    if env.get("is_msvc", False):
+        # https://stackoverflow.com/questions/64053597/how-do-i-enable-sse4-1-and-sse3-but-not-avx-in-msvc/69328426
+        env.Append(CCFLAGS=["/d2archSSE42"])
+    else:
+        # `-msse2` is implied when compiling for x86_64.
+        env.Append(CCFLAGS=["-msse4.2"])
+elif env["arch"] == "x86_32":
+    # Be more conservative with instruction sets on 32-bit x86 to improve compatibility.
+    # SSE and SSE2 are present on all CPUs that support 64-bit, even if running a 32-bit OS.
+    if env.get("is_msvc", False):
+        env.Append(CCFLAGS=["/arch:SSE2"])
+    else:
+        # Use `-mfpmath=sse` to use SSE for floating-point math, which is more stable than x87.
+        # `-mstackrealign` is needed for it to work.
+        env.Append(CCFLAGS=["-msse2", "-mfpmath=sse", "-mstackrealign"])
 
 scons_cache_path = os.environ.get("SCONS_CACHE")
 if scons_cache_path is not None:
@@ -185,12 +204,10 @@ angle_sources = [
     "angle/src/common/CompiledShaderState.cpp",
     "angle/src/common/Float16ToFloat32.cpp",
     "angle/src/common/MemoryBuffer.cpp",
-    "angle/src/common/PackedCLEnums_autogen.cpp",
     "angle/src/common/PackedEGLEnums_autogen.cpp",
     "angle/src/common/PackedEnums.cpp",
     "angle/src/common/PackedGLEnums_autogen.cpp",
     "angle/src/common/PoolAlloc.cpp",
-    "angle/src/common/RingBufferAllocator.cpp",
     "angle/src/common/SimpleMutex.cpp",
     "angle/src/common/WorkerThread.cpp",
     "angle/src/common/aligned_memory.cpp",
@@ -237,13 +254,13 @@ angle_sources = [
     "angle/src/compiler/translator/FunctionLookup.cpp",
     "angle/src/compiler/translator/HashNames.cpp",
     "angle/src/compiler/translator/ImmutableStringBuilder.cpp",
-    "angle/src/compiler/translator/ImmutableString_ESSL_autogen.cpp",
+    "angle/src/compiler/translator/ImmutableString_autogen.cpp",
     "angle/src/compiler/translator/InfoSink.cpp",
     "angle/src/compiler/translator/Initialize.cpp",
-    "angle/src/compiler/translator/InitializeDll.cpp",
     "angle/src/compiler/translator/IntermNode.cpp",
     "angle/src/compiler/translator/IntermRebuild.cpp",
     "angle/src/compiler/translator/IsASTDepthBelowLimit.cpp",
+    "angle/src/compiler/translator/Name.cpp",
     "angle/src/compiler/translator/Operator.cpp",
     "angle/src/compiler/translator/OutputTree.cpp",
     "angle/src/compiler/translator/ParseContext.cpp",
@@ -251,19 +268,15 @@ angle_sources = [
     "angle/src/compiler/translator/QualifierTypes.cpp",
     "angle/src/compiler/translator/ShaderLang.cpp",
     "angle/src/compiler/translator/ShaderVars.cpp",
+    "angle/src/compiler/translator/SizeClipCullDistance.cpp",
     "angle/src/compiler/translator/Symbol.cpp",
     "angle/src/compiler/translator/SymbolTable.cpp",
-    "angle/src/compiler/translator/SymbolTable_ESSL_autogen.cpp",
+    "angle/src/compiler/translator/SymbolTable_autogen.cpp",
     "angle/src/compiler/translator/SymbolUniqueId.cpp",
     "angle/src/compiler/translator/Types.cpp",
     "angle/src/compiler/translator/ValidateAST.cpp",
-    "angle/src/compiler/translator/ValidateBarrierFunctionCall.cpp",
-    "angle/src/compiler/translator/ValidateClipCullDistance.cpp",
     "angle/src/compiler/translator/ValidateGlobalInitializer.cpp",
-    "angle/src/compiler/translator/ValidateLimitations.cpp",
-    "angle/src/compiler/translator/ValidateMaxParameters.cpp",
     "angle/src/compiler/translator/ValidateOutputs.cpp",
-    "angle/src/compiler/translator/ValidateSwitch.cpp",
     "angle/src/compiler/translator/ValidateTypeSizeLimitations.cpp",
     "angle/src/compiler/translator/ValidateVaryingLocations.cpp",
     "angle/src/compiler/translator/VariablePacker.cpp",
@@ -288,35 +301,35 @@ angle_sources = [
     "angle/src/compiler/translator/tree_ops/EmulateGLFragColorBroadcast.cpp",
     "angle/src/compiler/translator/tree_ops/EmulateMultiDrawShaderBuiltins.cpp",
     "angle/src/compiler/translator/tree_ops/FoldExpressions.cpp",
-    "angle/src/compiler/translator/tree_ops/ForcePrecisionQualifier.cpp",
+    "angle/src/compiler/translator/tree_ops/GatherDefaultUniforms.cpp",
     "angle/src/compiler/translator/tree_ops/InitializeVariables.cpp",
     "angle/src/compiler/translator/tree_ops/MonomorphizeUnsupportedFunctions.cpp",
     "angle/src/compiler/translator/tree_ops/PreTransformTextureCubeGradDerivatives.cpp",
     "angle/src/compiler/translator/tree_ops/PruneEmptyCases.cpp",
     "angle/src/compiler/translator/tree_ops/PruneNoOps.cpp",
     "angle/src/compiler/translator/tree_ops/RecordConstantPrecision.cpp",
+    "angle/src/compiler/translator/tree_ops/ReduceInterfaceBlocks.cpp",
     "angle/src/compiler/translator/tree_ops/RemoveArrayLengthMethod.cpp",
     "angle/src/compiler/translator/tree_ops/RemoveAtomicCounterBuiltins.cpp",
     "angle/src/compiler/translator/tree_ops/RemoveDynamicIndexing.cpp",
     "angle/src/compiler/translator/tree_ops/RemoveInactiveInterfaceVariables.cpp",
     "angle/src/compiler/translator/tree_ops/RemoveInvariantDeclaration.cpp",
     "angle/src/compiler/translator/tree_ops/RemoveUnreferencedVariables.cpp",
+    "angle/src/compiler/translator/tree_ops/RemoveUnusedFramebufferFetch.cpp",
     "angle/src/compiler/translator/tree_ops/RescopeGlobalVariables.cpp",
     "angle/src/compiler/translator/tree_ops/RewriteArrayOfArrayOfOpaqueUniforms.cpp",
     "angle/src/compiler/translator/tree_ops/RewriteAtomicCounters.cpp",
-    "angle/src/compiler/translator/tree_ops/RewriteCubeMapSamplersAs2DArray.cpp",
     "angle/src/compiler/translator/tree_ops/RewriteDfdy.cpp",
     "angle/src/compiler/translator/tree_ops/RewritePixelLocalStorage.cpp",
     "angle/src/compiler/translator/tree_ops/RewriteStructSamplers.cpp",
     "angle/src/compiler/translator/tree_ops/RewriteTexelFetchOffset.cpp",
+    "angle/src/compiler/translator/tree_ops/ScalarizeVecAndMatConstructorArgs.cpp",
     "angle/src/compiler/translator/tree_ops/SeparateDeclarations.cpp",
-    "angle/src/compiler/translator/tree_ops/SeparateStructFromFunctionDeclarations.cpp",
     "angle/src/compiler/translator/tree_ops/SeparateStructFromUniformDeclarations.cpp",
     "angle/src/compiler/translator/tree_ops/SimplifyLoopConditions.cpp",
     "angle/src/compiler/translator/tree_ops/SplitSequenceOperator.cpp",
     "angle/src/compiler/translator/tree_ops/glsl/RegenerateStructNames.cpp",
     "angle/src/compiler/translator/tree_ops/glsl/RewriteRepeatedAssignToSwizzled.cpp",
-    "angle/src/compiler/translator/tree_ops/glsl/ScalarizeVecAndMatConstructorArgs.cpp",
     "angle/src/compiler/translator/tree_ops/glsl/UseInterfaceBlockFields.cpp",
     "angle/src/compiler/translator/tree_util/DriverUniform.cpp",
     "angle/src/compiler/translator/tree_util/FindFunction.cpp",
@@ -338,24 +351,11 @@ angle_sources = [
     "angle/src/libANGLE/AttributeMap.cpp",
     "angle/src/libANGLE/BlobCache.cpp",
     "angle/src/libANGLE/Buffer.cpp",
-    "angle/src/libANGLE/CLBuffer.cpp",
-    "angle/src/libANGLE/CLCommandQueue.cpp",
-    "angle/src/libANGLE/CLContext.cpp",
-    "angle/src/libANGLE/CLDevice.cpp",
-    "angle/src/libANGLE/CLEvent.cpp",
-    "angle/src/libANGLE/CLImage.cpp",
-    "angle/src/libANGLE/CLKernel.cpp",
-    "angle/src/libANGLE/CLMemory.cpp",
-    "angle/src/libANGLE/CLObject.cpp",
-    "angle/src/libANGLE/CLPlatform.cpp",
-    "angle/src/libANGLE/CLProgram.cpp",
-    "angle/src/libANGLE/CLSampler.cpp",
     "angle/src/libANGLE/Caps.cpp",
     "angle/src/libANGLE/Compiler.cpp",
     "angle/src/libANGLE/Config.cpp",
     "angle/src/libANGLE/Context.cpp",
     "angle/src/libANGLE/ContextMutex.cpp",
-    "angle/src/libANGLE/Context_gl.cpp",
     "angle/src/libANGLE/Context_gles_1_0.cpp",
     "angle/src/libANGLE/Debug.cpp",
     "angle/src/libANGLE/Device.cpp",
@@ -405,18 +405,12 @@ angle_sources = [
     "angle/src/libANGLE/VertexArray.cpp",
     "angle/src/libANGLE/VertexAttribute.cpp",
     "angle/src/libANGLE/angletypes.cpp",
-    "angle/src/libANGLE/cl_utils.cpp",
-    "angle/src/libANGLE/context_private_call_gl.cpp",
-    "angle/src/libANGLE/context_private_call_gles.cpp",
-    "angle/src/libANGLE/entry_points_utils.cpp",
     "angle/src/libANGLE/es3_copy_conversion_table_autogen.cpp",
     "angle/src/libANGLE/format_map_autogen.cpp",
-    "angle/src/libANGLE/format_map_desktop.cpp",
     "angle/src/libANGLE/formatutils.cpp",
     "angle/src/libANGLE/gles_extensions_autogen.cpp",
     "angle/src/libANGLE/queryconversions.cpp",
     "angle/src/libANGLE/queryutils.cpp",
-    "angle/src/libANGLE/validationCL.cpp",
     "angle/src/libANGLE/validationEGL.cpp",
     "angle/src/libANGLE/validationES.cpp",
     "angle/src/libANGLE/validationES1.cpp",
@@ -425,23 +419,9 @@ angle_sources = [
     "angle/src/libANGLE/validationES31.cpp",
     "angle/src/libANGLE/validationES32.cpp",
     "angle/src/libANGLE/validationESEXT.cpp",
-    "angle/src/libANGLE/validationGL1.cpp",
-    "angle/src/libANGLE/validationGL2.cpp",
-    "angle/src/libANGLE/validationGL3.cpp",
-    "angle/src/libANGLE/validationGL4.cpp",
     "angle/src/libANGLE/capture/FrameCapture_mock.cpp",
     "angle/src/libANGLE/capture/serialize_mock.cpp",
     "angle/src/libANGLE/renderer/BufferImpl.cpp",
-    "angle/src/libANGLE/renderer/CLCommandQueueImpl.cpp",
-    "angle/src/libANGLE/renderer/CLContextImpl.cpp",
-    "angle/src/libANGLE/renderer/CLDeviceImpl.cpp",
-    "angle/src/libANGLE/renderer/CLEventImpl.cpp",
-    "angle/src/libANGLE/renderer/CLExtensions.cpp",
-    "angle/src/libANGLE/renderer/CLKernelImpl.cpp",
-    "angle/src/libANGLE/renderer/CLMemoryImpl.cpp",
-    "angle/src/libANGLE/renderer/CLPlatformImpl.cpp",
-    "angle/src/libANGLE/renderer/CLProgramImpl.cpp",
-    "angle/src/libANGLE/renderer/CLSamplerImpl.cpp",
     "angle/src/libANGLE/renderer/ContextImpl.cpp",
     "angle/src/libANGLE/renderer/DeviceImpl.cpp",
     "angle/src/libANGLE/renderer/DisplayImpl.cpp",
@@ -509,13 +489,6 @@ if env["platform"] == "ios":
         "angle/src/common/system_utils_ios.mm",
         "angle/src/gpu_info_util/SystemInfo_ios.cpp",
         "angle/src/libANGLE/renderer/driver_utils_ios.mm",
-        "angle/src/libANGLE/renderer/gl/eagl/ContextEAGL.cpp",
-        "angle/src/libANGLE/renderer/gl/eagl/DeviceEAGL.cpp",
-        "angle/src/libANGLE/renderer/gl/eagl/DisplayEAGL.mm",
-        "angle/src/libANGLE/renderer/gl/eagl/FunctionsEAGL.mm",
-        "angle/src/libANGLE/renderer/gl/eagl/IOSurfaceSurfaceEAGL.mm",
-        "angle/src/libANGLE/renderer/gl/eagl/PbufferSurfaceEAGL.cpp",
-        "angle/src/libANGLE/renderer/gl/eagl/WindowSurfaceEAGL.mm",
     ]
 if env["platform"] == "macos" or env["platform"] == "ios":
     angle_sources += [
@@ -532,7 +505,6 @@ if env["platform"] == "macos" or env["platform"] == "ios":
         "angle/src/compiler/translator/msl/MapFunctionsToDefinitions.cpp",
         "angle/src/compiler/translator/msl/MapSymbols.cpp",
         "angle/src/compiler/translator/msl/ModifyStruct.cpp",
-        "angle/src/compiler/translator/msl/Name.cpp",
         "angle/src/compiler/translator/msl/Pipeline.cpp",
         "angle/src/compiler/translator/msl/ProgramPrelude.cpp",
         "angle/src/compiler/translator/msl/RewritePipelines.cpp",
@@ -541,28 +513,23 @@ if env["platform"] == "macos" or env["platform"] == "ios":
         "angle/src/compiler/translator/msl/TranslatorMSL.cpp",
         "angle/src/compiler/translator/msl/UtilsMSL.cpp",
         "angle/src/compiler/translator/tree_ops/glsl/apple/AddAndTrueToLoopCondition.cpp",
-        "angle/src/compiler/translator/tree_ops/glsl/apple/RewriteDoWhile.cpp",
         "angle/src/compiler/translator/tree_ops/glsl/apple/RewriteRowMajorMatrices.cpp",
-        "angle/src/compiler/translator/tree_ops/glsl/apple/RewriteUnaryMinusOperatorFloat.cpp",
         "angle/src/compiler/translator/tree_ops/glsl/apple/UnfoldShortCircuitAST.cpp",
         "angle/src/compiler/translator/tree_ops/msl/AddExplicitTypeCasts.cpp",
         "angle/src/compiler/translator/tree_ops/msl/ConvertUnsupportedConstructorsToFunctionCalls.cpp",
+        "angle/src/compiler/translator/tree_ops/msl/EnsureLoopForwardProgress.cpp",
         "angle/src/compiler/translator/tree_ops/msl/FixTypeConstructors.cpp",
         "angle/src/compiler/translator/tree_ops/msl/GuardFragDepthWrite.cpp",
         "angle/src/compiler/translator/tree_ops/msl/HoistConstants.cpp",
         "angle/src/compiler/translator/tree_ops/msl/IntroduceVertexIndexID.cpp",
-        "angle/src/compiler/translator/tree_ops/msl/NameEmbeddedUniformStructsMetal.cpp",
-        "angle/src/compiler/translator/tree_ops/msl/ReduceInterfaceBlocks.cpp",
         "angle/src/compiler/translator/tree_ops/msl/RewriteCaseDeclarations.cpp",
         "angle/src/compiler/translator/tree_ops/msl/RewriteInterpolants.cpp",
         "angle/src/compiler/translator/tree_ops/msl/RewriteOutArgs.cpp",
         "angle/src/compiler/translator/tree_ops/msl/RewriteUnaddressableReferences.cpp",
         "angle/src/compiler/translator/tree_ops/msl/SeparateCompoundExpressions.cpp",
-        "angle/src/compiler/translator/tree_ops/msl/SeparateCompoundStructDeclarations.cpp",
         "angle/src/compiler/translator/tree_ops/msl/TransposeRowMajorMatrices.cpp",
         "angle/src/compiler/translator/tree_ops/msl/WrapMain.cpp",
         "angle/src/gpu_info_util/SystemInfo_apple.mm",
-        "angle/src/libANGLE/renderer/driver_utils_mac.mm",
         "angle/src/libANGLE/renderer/metal/BufferMtl.mm",
         "angle/src/libANGLE/renderer/metal/CompilerMtl.mm",
         "angle/src/libANGLE/renderer/metal/ContextMtl.mm",
@@ -600,7 +567,6 @@ if env["platform"] == "macos" or env["platform"] == "ios":
         "angle/src/libANGLE/renderer/metal/mtl_resources.mm",
         "angle/src/libANGLE/renderer/metal/mtl_state_cache.mm",
         "angle/src/libANGLE/renderer/metal/mtl_utils.mm",
-        "angle/src/libANGLE/renderer/metal/process.cpp",
         "angle/src/libANGLE/renderer/metal/renderermtl_utils.cpp",
         "angle/src/libANGLE/renderer/gl/BlitGL.cpp",
         "angle/src/libANGLE/renderer/gl/BufferGL.cpp",
@@ -614,7 +580,6 @@ if env["platform"] == "macos" or env["platform"] == "ios":
         "angle/src/libANGLE/renderer/gl/FunctionsGL.cpp",
         "angle/src/libANGLE/renderer/gl/ImageGL.cpp",
         "angle/src/libANGLE/renderer/gl/MemoryObjectGL.cpp",
-        "angle/src/libANGLE/renderer/gl/PLSProgramCache.cpp",
         "angle/src/libANGLE/renderer/gl/ProgramExecutableGL.cpp",
         "angle/src/libANGLE/renderer/gl/ProgramGL.cpp",
         "angle/src/libANGLE/renderer/gl/ProgramPipelineGL.cpp",
@@ -639,13 +604,10 @@ if env["platform"] == "windows":
         "angle/src/common/system_utils_win.cpp",
         "angle/src/common/system_utils_win32.cpp",
         "angle/src/compiler/translator/hlsl/ASTMetadataHLSL.cpp",
-        "angle/src/compiler/translator/hlsl/AtomicCounterFunctionHLSL.cpp",
         "angle/src/compiler/translator/hlsl/BuiltInFunctionEmulatorHLSL.cpp",
         "angle/src/compiler/translator/hlsl/ImageFunctionHLSL.cpp",
         "angle/src/compiler/translator/hlsl/OutputHLSL.cpp",
         "angle/src/compiler/translator/hlsl/ResourcesHLSL.cpp",
-        "angle/src/compiler/translator/hlsl/ShaderStorageBlockFunctionHLSL.cpp",
-        "angle/src/compiler/translator/hlsl/ShaderStorageBlockOutputHLSL.cpp",
         "angle/src/compiler/translator/hlsl/StructureHLSL.cpp",
         "angle/src/compiler/translator/hlsl/TextureFunctionHLSL.cpp",
         "angle/src/compiler/translator/hlsl/TranslatorHLSL.cpp",
@@ -653,16 +615,12 @@ if env["platform"] == "windows":
         "angle/src/compiler/translator/hlsl/blocklayoutHLSL.cpp",
         "angle/src/compiler/translator/hlsl/emulated_builtin_functions_hlsl_autogen.cpp",
         "angle/src/compiler/translator/tree_ops/hlsl/AddDefaultReturnStatements.cpp",
-        "angle/src/compiler/translator/tree_ops/hlsl/AggregateAssignArraysInSSBOs.cpp",
-        "angle/src/compiler/translator/tree_ops/hlsl/AggregateAssignStructsInSSBOs.cpp",
         "angle/src/compiler/translator/tree_ops/hlsl/ArrayReturnValueToOutParameter.cpp",
         "angle/src/compiler/translator/tree_ops/hlsl/BreakVariableAliasingInInnerLoops.cpp",
         "angle/src/compiler/translator/tree_ops/hlsl/ExpandIntegerPowExpressions.cpp",
         "angle/src/compiler/translator/tree_ops/hlsl/RecordUniformBlocksWithLargeArrayMember.cpp",
         "angle/src/compiler/translator/tree_ops/hlsl/RemoveSwitchFallThrough.cpp",
-        "angle/src/compiler/translator/tree_ops/hlsl/RewriteAtomicFunctionExpressions.cpp",
         "angle/src/compiler/translator/tree_ops/hlsl/RewriteElseBlocks.cpp",
-        "angle/src/compiler/translator/tree_ops/hlsl/RewriteExpressionsWithShaderStorageBlock.cpp",
         "angle/src/compiler/translator/tree_ops/hlsl/RewriteUnaryMinusOperatorInt.cpp",
         "angle/src/compiler/translator/tree_ops/hlsl/SeparateArrayConstructorStatements.cpp",
         "angle/src/compiler/translator/tree_ops/hlsl/SeparateArrayInitialization.cpp",
@@ -742,6 +700,7 @@ angle_sources_egl = [
 angle_sources_gles = [
     "angle/src/libGLESv2/egl_ext_stubs.cpp",
     "angle/src/libGLESv2/egl_stubs.cpp",
+    "angle/src/libGLESv2/egl_stubs_getprocaddress_autogen.cpp",
     "angle/src/libGLESv2/entry_points_egl_autogen.cpp",
     "angle/src/libGLESv2/entry_points_egl_ext_autogen.cpp",
     "angle/src/libGLESv2/entry_points_gles_1_0_autogen.cpp",
@@ -752,7 +711,6 @@ angle_sources_gles = [
     "angle/src/libGLESv2/entry_points_gles_ext_autogen.cpp",
     "angle/src/libGLESv2/global_state.cpp",
     "angle/src/libGLESv2/libGLESv2_autogen.cpp",
-    "angle/src/libGLESv2/proc_table_egl_autogen.cpp",
 ]
 env.Append(CPPDEFINES=[("ANGLE_CAPTURE_ENABLED", 0)])
 env.Append(CPPDEFINES=[("ANGLE_ENABLE_ESSL", 1)])
@@ -777,6 +735,7 @@ if env["platform"] == "macos":
 if env["platform"] == "windows":
     env.Append(CPPDEFINES=[("ANGLE_IS_WIN", 1)])
     env.Append(CPPDEFINES=[("ANGLE_WINDOWS_NO_FUTEX", 1)])
+    env.Append(CPPDEFINES=[("ANGLE_PLATFORM_EXPORT",'""')])
     env.Append(
         CPPDEFINES=[
             (
@@ -797,7 +756,6 @@ if env["platform"] == "ios":
     else:
         env.Append(CPPDEFINES=["ANGLE_PLATFORM_IOS_FAMILY_SIMULATOR"])
     env.Append(CPPDEFINES=[("ANGLE_ENABLE_METAL", 1)])
-    env.Append(CPPDEFINES=[("ANGLE_ENABLE_OPENGL", 1)])
     env.Append(CPPDEFINES=[("ANGLE_ENABLE_GL_NULL", 1)])
     env.Append(CPPDEFINES=[("ANGLE_ENABLE_EAGL", 1)])
     env.Append(CPPDEFINES=[("GLES_SILENCE_DEPRECATION", 1)])

file_list

@@ -1,12 +1,10 @@
 ./src/common/CompiledShaderState.cpp
 ./src/common/Float16ToFloat32.cpp
 ./src/common/MemoryBuffer.cpp
-./src/common/PackedCLEnums_autogen.cpp
 ./src/common/PackedEGLEnums_autogen.cpp
 ./src/common/PackedEnums.cpp
 ./src/common/PackedGLEnums_autogen.cpp
 ./src/common/PoolAlloc.cpp
-./src/common/RingBufferAllocator.cpp
 ./src/common/SimpleMutex.cpp
 ./src/common/WorkerThread.cpp
 ./src/common/aligned_memory.cpp
@@ -53,13 +51,13 @@
 ./src/compiler/translator/FunctionLookup.cpp
 ./src/compiler/translator/HashNames.cpp
 ./src/compiler/translator/ImmutableStringBuilder.cpp
-./src/compiler/translator/ImmutableString_ESSL_autogen.cpp
+./src/compiler/translator/ImmutableString_autogen.cpp
 ./src/compiler/translator/InfoSink.cpp
 ./src/compiler/translator/Initialize.cpp
-./src/compiler/translator/InitializeDll.cpp
 ./src/compiler/translator/IntermNode.cpp
 ./src/compiler/translator/IntermRebuild.cpp
 ./src/compiler/translator/IsASTDepthBelowLimit.cpp
+./src/compiler/translator/Name.cpp
 ./src/compiler/translator/Operator.cpp
 ./src/compiler/translator/OutputTree.cpp
 ./src/compiler/translator/ParseContext.cpp
@@ -67,19 +65,15 @@
 ./src/compiler/translator/QualifierTypes.cpp
 ./src/compiler/translator/ShaderLang.cpp
 ./src/compiler/translator/ShaderVars.cpp
+./src/compiler/translator/SizeClipCullDistance.cpp
 ./src/compiler/translator/Symbol.cpp
 ./src/compiler/translator/SymbolTable.cpp
-./src/compiler/translator/SymbolTable_ESSL_autogen.cpp
+./src/compiler/translator/SymbolTable_autogen.cpp
 ./src/compiler/translator/SymbolUniqueId.cpp
 ./src/compiler/translator/Types.cpp
 ./src/compiler/translator/ValidateAST.cpp
-./src/compiler/translator/ValidateBarrierFunctionCall.cpp
-./src/compiler/translator/ValidateClipCullDistance.cpp
 ./src/compiler/translator/ValidateGlobalInitializer.cpp
-./src/compiler/translator/ValidateLimitations.cpp
-./src/compiler/translator/ValidateMaxParameters.cpp
 ./src/compiler/translator/ValidateOutputs.cpp
-./src/compiler/translator/ValidateSwitch.cpp
 ./src/compiler/translator/ValidateTypeSizeLimitations.cpp
 ./src/compiler/translator/ValidateVaryingLocations.cpp
 ./src/compiler/translator/VariablePacker.cpp
@@ -104,35 +98,35 @@
 ./src/compiler/translator/tree_ops/EmulateGLFragColorBroadcast.cpp
 ./src/compiler/translator/tree_ops/EmulateMultiDrawShaderBuiltins.cpp
 ./src/compiler/translator/tree_ops/FoldExpressions.cpp
-./src/compiler/translator/tree_ops/ForcePrecisionQualifier.cpp
+./src/compiler/translator/tree_ops/GatherDefaultUniforms.cpp
 ./src/compiler/translator/tree_ops/InitializeVariables.cpp
 ./src/compiler/translator/tree_ops/MonomorphizeUnsupportedFunctions.cpp
 ./src/compiler/translator/tree_ops/PreTransformTextureCubeGradDerivatives.cpp
 ./src/compiler/translator/tree_ops/PruneEmptyCases.cpp
 ./src/compiler/translator/tree_ops/PruneNoOps.cpp
 ./src/compiler/translator/tree_ops/RecordConstantPrecision.cpp
+./src/compiler/translator/tree_ops/ReduceInterfaceBlocks.cpp
 ./src/compiler/translator/tree_ops/RemoveArrayLengthMethod.cpp
 ./src/compiler/translator/tree_ops/RemoveAtomicCounterBuiltins.cpp
 ./src/compiler/translator/tree_ops/RemoveDynamicIndexing.cpp
 ./src/compiler/translator/tree_ops/RemoveInactiveInterfaceVariables.cpp
 ./src/compiler/translator/tree_ops/RemoveInvariantDeclaration.cpp
 ./src/compiler/translator/tree_ops/RemoveUnreferencedVariables.cpp
+./src/compiler/translator/tree_ops/RemoveUnusedFramebufferFetch.cpp
 ./src/compiler/translator/tree_ops/RescopeGlobalVariables.cpp
 ./src/compiler/translator/tree_ops/RewriteArrayOfArrayOfOpaqueUniforms.cpp
 ./src/compiler/translator/tree_ops/RewriteAtomicCounters.cpp
-./src/compiler/translator/tree_ops/RewriteCubeMapSamplersAs2DArray.cpp
 ./src/compiler/translator/tree_ops/RewriteDfdy.cpp
 ./src/compiler/translator/tree_ops/RewritePixelLocalStorage.cpp
 ./src/compiler/translator/tree_ops/RewriteStructSamplers.cpp
 ./src/compiler/translator/tree_ops/RewriteTexelFetchOffset.cpp
+./src/compiler/translator/tree_ops/ScalarizeVecAndMatConstructorArgs.cpp
 ./src/compiler/translator/tree_ops/SeparateDeclarations.cpp
-./src/compiler/translator/tree_ops/SeparateStructFromFunctionDeclarations.cpp
 ./src/compiler/translator/tree_ops/SeparateStructFromUniformDeclarations.cpp
 ./src/compiler/translator/tree_ops/SimplifyLoopConditions.cpp
 ./src/compiler/translator/tree_ops/SplitSequenceOperator.cpp
 ./src/compiler/translator/tree_ops/glsl/RegenerateStructNames.cpp
 ./src/compiler/translator/tree_ops/glsl/RewriteRepeatedAssignToSwizzled.cpp
-./src/compiler/translator/tree_ops/glsl/ScalarizeVecAndMatConstructorArgs.cpp
 ./src/compiler/translator/tree_ops/glsl/UseInterfaceBlockFields.cpp
 ./src/compiler/translator/tree_util/DriverUniform.cpp
 ./src/compiler/translator/tree_util/FindFunction.cpp
@@ -154,24 +148,11 @@
 ./src/libANGLE/AttributeMap.cpp
 ./src/libANGLE/BlobCache.cpp
 ./src/libANGLE/Buffer.cpp
-./src/libANGLE/CLBuffer.cpp
-./src/libANGLE/CLCommandQueue.cpp
-./src/libANGLE/CLContext.cpp
-./src/libANGLE/CLDevice.cpp
-./src/libANGLE/CLEvent.cpp
-./src/libANGLE/CLImage.cpp
-./src/libANGLE/CLKernel.cpp
-./src/libANGLE/CLMemory.cpp
-./src/libANGLE/CLObject.cpp
-./src/libANGLE/CLPlatform.cpp
-./src/libANGLE/CLProgram.cpp
-./src/libANGLE/CLSampler.cpp
 ./src/libANGLE/Caps.cpp
 ./src/libANGLE/Compiler.cpp
 ./src/libANGLE/Config.cpp
 ./src/libANGLE/Context.cpp
 ./src/libANGLE/ContextMutex.cpp
-./src/libANGLE/Context_gl.cpp
 ./src/libANGLE/Context_gles_1_0.cpp
 ./src/libANGLE/Debug.cpp
 ./src/libANGLE/Device.cpp
@@ -221,18 +202,12 @@
 ./src/libANGLE/VertexArray.cpp
 ./src/libANGLE/VertexAttribute.cpp
 ./src/libANGLE/angletypes.cpp
-./src/libANGLE/cl_utils.cpp
-./src/libANGLE/context_private_call_gl.cpp
-./src/libANGLE/context_private_call_gles.cpp
-./src/libANGLE/entry_points_utils.cpp
 ./src/libANGLE/es3_copy_conversion_table_autogen.cpp
 ./src/libANGLE/format_map_autogen.cpp
-./src/libANGLE/format_map_desktop.cpp
 ./src/libANGLE/formatutils.cpp
 ./src/libANGLE/gles_extensions_autogen.cpp
 ./src/libANGLE/queryconversions.cpp
 ./src/libANGLE/queryutils.cpp
-./src/libANGLE/validationCL.cpp
 ./src/libANGLE/validationEGL.cpp
 ./src/libANGLE/validationES.cpp
 ./src/libANGLE/validationES1.cpp
@@ -241,23 +216,9 @@
 ./src/libANGLE/validationES31.cpp
 ./src/libANGLE/validationES32.cpp
 ./src/libANGLE/validationESEXT.cpp
-./src/libANGLE/validationGL1.cpp
-./src/libANGLE/validationGL2.cpp
-./src/libANGLE/validationGL3.cpp
-./src/libANGLE/validationGL4.cpp
 ./src/libANGLE/capture/FrameCapture_mock.cpp
 ./src/libANGLE/capture/serialize_mock.cpp
 ./src/libANGLE/renderer/BufferImpl.cpp
-./src/libANGLE/renderer/CLCommandQueueImpl.cpp
-./src/libANGLE/renderer/CLContextImpl.cpp
-./src/libANGLE/renderer/CLDeviceImpl.cpp
-./src/libANGLE/renderer/CLEventImpl.cpp
-./src/libANGLE/renderer/CLExtensions.cpp
-./src/libANGLE/renderer/CLKernelImpl.cpp
-./src/libANGLE/renderer/CLMemoryImpl.cpp
-./src/libANGLE/renderer/CLPlatformImpl.cpp
-./src/libANGLE/renderer/CLProgramImpl.cpp
-./src/libANGLE/renderer/CLSamplerImpl.cpp
 ./src/libANGLE/renderer/ContextImpl.cpp
 ./src/libANGLE/renderer/DeviceImpl.cpp
 ./src/libANGLE/renderer/DisplayImpl.cpp
@@ -281,10 +242,10 @@
 ./src/image_util/AstcDecompressor.cpp
 ./src/image_util/copyimage.cpp
 ./src/image_util/imageformats.cpp
+./src/image_util/loadimage.cpp
 ./src/image_util/loadimage_astc.cpp
 ./src/image_util/loadimage_etc.cpp
 ./src/image_util/loadimage_paletted.cpp
-./src/image_util/loadimage.cpp
 ./src/image_util/storeimage_paletted.cpp
 ./src/common/third_party/xxhash/xxhash.c
 ./src/common/system_utils_apple.cpp
@@ -301,13 +262,6 @@
 ./src/common/system_utils_ios.mm
 ./src/gpu_info_util/SystemInfo_ios.cpp
 ./src/libANGLE/renderer/driver_utils_ios.mm
-./src/libANGLE/renderer/gl/eagl/ContextEAGL.cpp
-./src/libANGLE/renderer/gl/eagl/DeviceEAGL.cpp
-./src/libANGLE/renderer/gl/eagl/DisplayEAGL.mm
-./src/libANGLE/renderer/gl/eagl/FunctionsEAGL.mm
-./src/libANGLE/renderer/gl/eagl/IOSurfaceSurfaceEAGL.mm
-./src/libANGLE/renderer/gl/eagl/PbufferSurfaceEAGL.cpp
-./src/libANGLE/renderer/gl/eagl/WindowSurfaceEAGL.mm
 ./src/common/apple_platform_utils.mm
 ./src/common/system_utils_posix.cpp
 ./src/compiler/translator/msl/AstHelpers.cpp
@@ -321,7 +275,6 @@
 ./src/compiler/translator/msl/MapFunctionsToDefinitions.cpp
 ./src/compiler/translator/msl/MapSymbols.cpp
 ./src/compiler/translator/msl/ModifyStruct.cpp
-./src/compiler/translator/msl/Name.cpp
 ./src/compiler/translator/msl/Pipeline.cpp
 ./src/compiler/translator/msl/ProgramPrelude.cpp
 ./src/compiler/translator/msl/RewritePipelines.cpp
@@ -330,28 +283,23 @@
 ./src/compiler/translator/msl/TranslatorMSL.cpp
 ./src/compiler/translator/msl/UtilsMSL.cpp
 ./src/compiler/translator/tree_ops/glsl/apple/AddAndTrueToLoopCondition.cpp
-./src/compiler/translator/tree_ops/glsl/apple/RewriteDoWhile.cpp
 ./src/compiler/translator/tree_ops/glsl/apple/RewriteRowMajorMatrices.cpp
-./src/compiler/translator/tree_ops/glsl/apple/RewriteUnaryMinusOperatorFloat.cpp
 ./src/compiler/translator/tree_ops/glsl/apple/UnfoldShortCircuitAST.cpp
 ./src/compiler/translator/tree_ops/msl/AddExplicitTypeCasts.cpp
 ./src/compiler/translator/tree_ops/msl/ConvertUnsupportedConstructorsToFunctionCalls.cpp
+./src/compiler/translator/tree_ops/msl/EnsureLoopForwardProgress.cpp
 ./src/compiler/translator/tree_ops/msl/FixTypeConstructors.cpp
 ./src/compiler/translator/tree_ops/msl/GuardFragDepthWrite.cpp
 ./src/compiler/translator/tree_ops/msl/HoistConstants.cpp
 ./src/compiler/translator/tree_ops/msl/IntroduceVertexIndexID.cpp
-./src/compiler/translator/tree_ops/msl/NameEmbeddedUniformStructsMetal.cpp
-./src/compiler/translator/tree_ops/msl/ReduceInterfaceBlocks.cpp
 ./src/compiler/translator/tree_ops/msl/RewriteCaseDeclarations.cpp
 ./src/compiler/translator/tree_ops/msl/RewriteInterpolants.cpp
 ./src/compiler/translator/tree_ops/msl/RewriteOutArgs.cpp
 ./src/compiler/translator/tree_ops/msl/RewriteUnaddressableReferences.cpp
 ./src/compiler/translator/tree_ops/msl/SeparateCompoundExpressions.cpp
-./src/compiler/translator/tree_ops/msl/SeparateCompoundStructDeclarations.cpp
 ./src/compiler/translator/tree_ops/msl/TransposeRowMajorMatrices.cpp
 ./src/compiler/translator/tree_ops/msl/WrapMain.cpp
 ./src/gpu_info_util/SystemInfo_apple.mm
-./src/libANGLE/renderer/driver_utils_mac.mm
 ./src/libANGLE/renderer/metal/BufferMtl.mm
 ./src/libANGLE/renderer/metal/CompilerMtl.mm
 ./src/libANGLE/renderer/metal/ContextMtl.mm
@@ -389,7 +337,6 @@
 ./src/libANGLE/renderer/metal/mtl_resources.mm
 ./src/libANGLE/renderer/metal/mtl_state_cache.mm
 ./src/libANGLE/renderer/metal/mtl_utils.mm
-./src/libANGLE/renderer/metal/process.cpp
 ./src/libANGLE/renderer/metal/renderermtl_utils.cpp
 ./src/libANGLE/renderer/gl/BlitGL.cpp
 ./src/libANGLE/renderer/gl/BufferGL.cpp
@@ -403,7 +350,6 @@
 ./src/libANGLE/renderer/gl/FunctionsGL.cpp
 ./src/libANGLE/renderer/gl/ImageGL.cpp
 ./src/libANGLE/renderer/gl/MemoryObjectGL.cpp
-./src/libANGLE/renderer/gl/PLSProgramCache.cpp
 ./src/libANGLE/renderer/gl/ProgramExecutableGL.cpp
 ./src/libANGLE/renderer/gl/ProgramGL.cpp
 ./src/libANGLE/renderer/gl/ProgramPipelineGL.cpp
@@ -425,13 +371,10 @@
 ./src/common/system_utils_win.cpp
 ./src/common/system_utils_win32.cpp
 ./src/compiler/translator/hlsl/ASTMetadataHLSL.cpp
-./src/compiler/translator/hlsl/AtomicCounterFunctionHLSL.cpp
 ./src/compiler/translator/hlsl/BuiltInFunctionEmulatorHLSL.cpp
 ./src/compiler/translator/hlsl/ImageFunctionHLSL.cpp
 ./src/compiler/translator/hlsl/OutputHLSL.cpp
 ./src/compiler/translator/hlsl/ResourcesHLSL.cpp
-./src/compiler/translator/hlsl/ShaderStorageBlockFunctionHLSL.cpp
-./src/compiler/translator/hlsl/ShaderStorageBlockOutputHLSL.cpp
 ./src/compiler/translator/hlsl/StructureHLSL.cpp
 ./src/compiler/translator/hlsl/TextureFunctionHLSL.cpp
 ./src/compiler/translator/hlsl/TranslatorHLSL.cpp
@@ -439,16 +382,12 @@
 ./src/compiler/translator/hlsl/blocklayoutHLSL.cpp
 ./src/compiler/translator/hlsl/emulated_builtin_functions_hlsl_autogen.cpp
 ./src/compiler/translator/tree_ops/hlsl/AddDefaultReturnStatements.cpp
-./src/compiler/translator/tree_ops/hlsl/AggregateAssignArraysInSSBOs.cpp
-./src/compiler/translator/tree_ops/hlsl/AggregateAssignStructsInSSBOs.cpp
 ./src/compiler/translator/tree_ops/hlsl/ArrayReturnValueToOutParameter.cpp
 ./src/compiler/translator/tree_ops/hlsl/BreakVariableAliasingInInnerLoops.cpp
 ./src/compiler/translator/tree_ops/hlsl/ExpandIntegerPowExpressions.cpp
 ./src/compiler/translator/tree_ops/hlsl/RecordUniformBlocksWithLargeArrayMember.cpp
 ./src/compiler/translator/tree_ops/hlsl/RemoveSwitchFallThrough.cpp
-./src/compiler/translator/tree_ops/hlsl/RewriteAtomicFunctionExpressions.cpp
 ./src/compiler/translator/tree_ops/hlsl/RewriteElseBlocks.cpp
-./src/compiler/translator/tree_ops/hlsl/RewriteExpressionsWithShaderStorageBlock.cpp
 ./src/compiler/translator/tree_ops/hlsl/RewriteUnaryMinusOperatorInt.cpp
 ./src/compiler/translator/tree_ops/hlsl/SeparateArrayConstructorStatements.cpp
 ./src/compiler/translator/tree_ops/hlsl/SeparateArrayInitialization.cpp
@@ -524,6 +463,7 @@
 ./src/libEGL/libEGL_autogen.cpp
 ./src/libGLESv2/egl_ext_stubs.cpp
 ./src/libGLESv2/egl_stubs.cpp
+./src/libGLESv2/egl_stubs_getprocaddress_autogen.cpp
 ./src/libGLESv2/entry_points_egl_autogen.cpp
 ./src/libGLESv2/entry_points_egl_ext_autogen.cpp
 ./src/libGLESv2/entry_points_gles_1_0_autogen.cpp
@@ -534,4 +474,3 @@
 ./src/libGLESv2/entry_points_gles_ext_autogen.cpp
 ./src/libGLESv2/global_state.cpp
 ./src/libGLESv2/libGLESv2_autogen.cpp
-./src/libGLESv2/proc_table_egl_autogen.cpp

godot-patches/patch_ios_swap_rename.diff

@@ -1,12 +0,0 @@
-diff --git a/angle/src/libANGLE/renderer/gl/eagl/WindowSurfaceEAGL.h b/angle/src/libANGLE/renderer/gl/eagl/WindowSurfaceEAGL.h
-index d482fd928..58ed2c9e5 100644
---- a/angle/src/libANGLE/renderer/gl/eagl/WindowSurfaceEAGL.h
-+++ b/angle/src/libANGLE/renderer/gl/eagl/WindowSurfaceEAGL.h
-@@ -26,6 +26,7 @@ typedef __IOSurface *IOSurfaceRef;
- #if defined(PREFIX_OBJECTIVE_C_CLASSES_WITH_WEB_FOR_WEBKIT)
- #    define SwapLayerEAGL WebSwapLayerEAGL
- #endif
-+#define SwapLayerEAGL GodotSwapLayerEAGL
- @class SwapLayerEAGL;
- 
- namespace rx

godot-patches/patch_mingw_build.diff

@@ -28,7 +28,7 @@ index 0e64f78d53..17ed63e66c 100644
      mHostVisual.As(&visual);
  
      ABI::Windows::Foundation::Numerics::Vector2 size;
-+#if defined(MINGW_ENABLED)
++#if defined(MINGW_ENABLED) && (__MINGW64_VERSION_MAJOR < 13)
 +    HRESULT hr = visual->get_Size((ABI::Windows::UI::Composition::Vector2*)&size);
 +#else
      HRESULT hr = visual->get_Size(&size);
@@ -39,7 +39,7 @@ index 0e64f78d53..17ed63e66c 100644
      }
  
      ABI::Windows::Foundation::Numerics::Vector3 offset;
-+#if defined(MINGW_ENABLED)
++#if defined(MINGW_ENABLED) && (__MINGW64_VERSION_MAJOR < 13)
 +    hr = visual->get_Offset((ABI::Windows::UI::Composition::Vector3*)&offset);
 +#else
      hr = visual->get_Offset(&offset);
@@ -48,10 +48,10 @@ index 0e64f78d53..17ed63e66c 100644
      {
          return false;
 diff --git a/angle/src/libANGLE/renderer/d3d/d3d11/converged/CompositorNativeWindow11.h b/angle/src/libANGLE/renderer/d3d/d3d11/converged/CompositorNativeWindow11.h
-index aec331a76c..be98814486 100644
+index 688f937724..8f3232cc72 100644
 --- a/angle/src/libANGLE/renderer/d3d/d3d11/converged/CompositorNativeWindow11.h
 +++ b/angle/src/libANGLE/renderer/d3d/d3d11/converged/CompositorNativeWindow11.h
-@@ -12,6 +12,143 @@
+@@ -12,6 +12,147 @@
  
  #include "libANGLE/renderer/d3d/d3d11/NativeWindow11.h"
  
@@ -192,19 +192,10 @@ index aec331a76c..be98814486 100644
 +#endif
 +#endif
 +
- #include <dispatcherqueue.h>
++#if defined(MINGW_ENABLED) && (__MINGW64_VERSION_MAJOR == 13)
++#define ____FIReference_1_BYTE_INTERFACE_DEFINED__
++#endif
++
+ #include <DispatcherQueue.h>
  #include <windows.foundation.metadata.h>
  #include <windows.ui.composition.h>
-diff --git a/third_party/zlib/cpu_features.c b/third_party/zlib/cpu_features.c
-index 64e0428..1332971 100644
---- a/third_party/zlib/cpu_features.c
-+++ b/third_party/zlib/cpu_features.c
-@@ -11,7 +11,7 @@
- #include <stdint.h>
- #if defined(_MSC_VER)
- #include <intrin.h>
--#elif defined(ADLER32_SIMD_SSSE3)
-+#elif defined(ADLER32_SIMD_SSSE3) || (defined(MINGW_ENABLED) && (defined(__i386__) || defined(__x86_64__)))
- #include <cpuid.h>
- #endif
- 

godot-patches/patch_zlib.diff

@@ -0,0 +1,14 @@
+diff --git a/third_party/zlib/cpu_features.c b/third_party/zlib/cpu_features.c
+index 64e0428..1332971 100644
+--- a/third_party/zlib/cpu_features.c
++++ b/third_party/zlib/cpu_features.c
+@@ -11,7 +11,7 @@
+ #include <stdint.h>
+ #if defined(_MSC_VER)
+ #include <intrin.h>
+-#elif defined(ADLER32_SIMD_SSSE3)
++#elif defined(ADLER32_SIMD_SSSE3) || (defined(MINGW_ENABLED) && (defined(__i386__) || defined(__x86_64__)))
+ #include <cpuid.h>
+ #endif
+ 
+