Merge changes from the latest ANGLE version whilst preserving modifications

.clang-format

@@ -33,6 +33,8 @@ BraceWrapping:
   # Keeps extern "C" blocks unindented.
   AfterExternBlock: false
 
+InsertBraces: true
+
 # Indent case labels.
 IndentCaseLabels: true
 

.clang-format-ignore

@@ -0,0 +1 @@
+# Void parent level config to enable formatting.

.github/workflows/sync_latest_angle.yml

@@ -0,0 +1,23 @@
+name: Sync latest ANGLE
+on:
+  workflow_dispatch:
+jobs:
+  Sync_latest_ANGLE:
+    runs-on: macos-latest
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v5
+      with:
+        fetch-depth: 0
+
+    - name: Configure Git user
+      run: |
+        git config user.name "github-actions[bot]"
+        git config user.email "github-actions[bot]@users.noreply.github.com"
+
+    - name: Sync latest ANGLE
+      run: |
+        git remote add upstream https://github.com/google/angle.git
+        git fetch upstream main
+        git merge upstream/main -m "Merge remote-tracking branch 'upstream/main' into metal-freeze"
+        git push

.gitignore

@@ -56,10 +56,9 @@
 /third_party/gles1_conform
 /third_party/glmark2/src
 /third_party/glslang/src
-/third_party/googletest
+/third_party/googletest/src
 /third_party/ijar
 /third_party/jdk/current
-/third_party/jdk/extras/java_8
 /third_party/jinja2
 /third_party/jsoncpp
 /third_party/kotlin_stdlib
@@ -92,6 +91,7 @@
 /third_party/r8/d8/cipd
 /third_party/r8/lib
 /third_party/rapidjson/src
+/third_party/re2/src
 /third_party/requests/src
 /third_party/rust
 /third_party/rust-toolchain
@@ -133,6 +133,7 @@
 /tools/rust
 /tools/skia_goldctl
 /tools/valgrind
+/tools/win
 angle.iml
 angle_debug.txt
 /build

.gitmodules

@@ -53,15 +53,15 @@
 [submodule "third_party/clspv/src"]
 	path = third_party/clspv/src
 	url = https://chromium.googlesource.com/external/github.com/google/clspv
-	gclient-condition = not build_with_chromium
+	gclient-condition = checkout_angle_cl_deps and not build_with_chromium
 [submodule "third_party/cpu_features/src"]
 	path = third_party/cpu_features/src
 	url = https://chromium.googlesource.com/external/github.com/google/cpu_features
 	gclient-condition = checkout_android and not build_with_chromium
 [submodule "third_party/dawn"]
 	path = third_party/dawn
 	url = https://dawn.googlesource.com/dawn
-	gclient-condition = not build_with_chromium
+	gclient-condition = checkout_angle_dawn_deps and not build_with_chromium
 [submodule "third_party/depot_tools"]
 	path = third_party/depot_tools
 	url = https://chromium.googlesource.com/chromium/tools/depot_tools
@@ -81,9 +81,9 @@
 [submodule "third_party/glmark2/src"]
 	path = third_party/glmark2/src
 	url = https://chromium.googlesource.com/external/github.com/glmark2/glmark2
-[submodule "third_party/googletest"]
-	path = third_party/googletest
-	url = https://chromium.googlesource.com/chromium/src/third_party/googletest
+[submodule "third_party/googletest/src"]
+	path = third_party/googletest/src
+	url = https://chromium.googlesource.com/external/github.com/google/googletest
 	gclient-condition = not build_with_chromium
 [submodule "third_party/ijar"]
 	path = third_party/ijar
@@ -104,7 +104,7 @@
 [submodule "third_party/llvm/src"]
 	path = third_party/llvm/src
 	url = https://chromium.googlesource.com/external/github.com/llvm/llvm-project
-	gclient-condition = not build_with_chromium
+	gclient-condition = checkout_angle_cl_deps and not build_with_chromium
 [submodule "third_party/jinja2"]
 	path = third_party/jinja2
 	url = https://chromium.googlesource.com/chromium/src/third_party/jinja2
@@ -148,15 +148,15 @@
 [submodule "third_party/OpenCL-CTS/src"]
 	path = third_party/OpenCL-CTS/src
 	url = https://chromium.googlesource.com/external/github.com/KhronosGroup/OpenCL-CTS
-	gclient-condition = not build_with_chromium
+	gclient-condition = checkout_angle_cl_deps and not build_with_chromium
 [submodule "third_party/OpenCL-Docs/src"]
 	path = third_party/OpenCL-Docs/src
 	url = https://chromium.googlesource.com/external/github.com/KhronosGroup/OpenCL-Docs
 	gclient-condition = not build_with_chromium
 [submodule "third_party/OpenCL-ICD-Loader/src"]
 	path = third_party/OpenCL-ICD-Loader/src
 	url = https://chromium.googlesource.com/external/github.com/KhronosGroup/OpenCL-ICD-Loader
-	gclient-condition = not build_with_chromium
+	gclient-condition = checkout_angle_cl_deps and not build_with_chromium
 [submodule "third_party/OpenGL-Registry/src"]
 	path = third_party/OpenGL-Registry/src
 	url = https://chromium.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry
@@ -176,6 +176,10 @@
 [submodule "third_party/rapidjson/src"]
 	path = third_party/rapidjson/src
 	url = https://chromium.googlesource.com/external/github.com/Tencent/rapidjson
+[submodule "third_party/re2/src"]
+	path = third_party/re2/src
+	url = https://chromium.googlesource.com/external/github.com/google/re2
+	gclient-condition = not build_with_chromium
 [submodule "third_party/requests/src"]
 	path = third_party/requests/src
 	url = https://chromium.googlesource.com/external/github.com/kennethreitz/requests
@@ -291,3 +295,7 @@
 	path = tools/valgrind
 	url = https://chromium.googlesource.com/chromium/src/tools/valgrind
 	gclient-condition = not build_with_chromium
+[submodule "tools/win"]
+	path = tools/win
+	url = https://chromium.googlesource.com/chromium/src/tools/win
+	gclient-condition = checkout_win and not build_with_chromium

.gn

@@ -37,21 +37,39 @@ exec_script_allowlist = angle_dotfile_settings.exec_script_allowlist +
                         ]
 
 default_args = {
-  clang_use_chrome_plugins = false
+  clang_use_chrome_plugins = true
   build_angle_deqp_tests = true
   use_sysroot = true
 
+  # Turns on unsafe buffer warning suppressions during build.
+  clang_unsafe_buffers_paths = "//unsafe_buffers_paths.txt"
+
   # Saves on importing extra dependencies and ANGLE doesn't use JS.
   enable_js_protobuf = false
 
+  # Needed only for std::atomic_ref<T> for large Ts http://crbug.com/402171653
+  use_llvm_libatomic = false
+
   # Disable location tags in isolates.
   tests_have_location_tags = false
 
   # Use base level API level 29 support for AHardwareBuffer ANGLE tests.
-  android32_ndk_api_level = 29
-  android64_ndk_api_level = 29
+  android_ndk_api_level = 29
 
   vma_vulkan_headers_dir = "//third_party/vulkan-headers/src"
+
+  # Use Siso instead of Ninja.
+  use_siso = true
+
+  # TODO(439777063): llvm and Dawn need to fix includes
+  use_clang_modules = false
+
+  # Enable Rust usage
+  enable_rust = true
+  enable_rust_cxx = true
+
+  # Angle must stay in C++20 for longer due to some downstream dependencies.
+  use_cxx23 = false
 }
 
 no_check_targets = [ "third_party/dawn/*" ]

.rustfmt.toml

@@ -0,0 +1,20 @@
+# This file defines the Rust style for automatic reformatting.
+# See also https://rust-lang.github.io/rustfmt
+#
+# ANGLE's rustfmt file mostly follows Chromium's, with the exception of line widths.
+
+# Rust language edition to be used by the parser.
+edition = "2024"
+# Version of the formatting rules to use.
+style_edition = "2024"
+# Line endings will be converted to \n.
+newline_style = "Unix"
+wrap_comments = true
+comment_width = 100
+max_width = 100
+# The "Default" setting has a heuristic which splits lines too aggresively.
+# We are willing to revisit this setting in future versions of rustfmt.
+# Bugs:
+# * https://github.com/rust-lang/rustfmt/issues/3119
+# * https://github.com/rust-lang/rustfmt/issues/3120
+use_small_heuristics = "Max"