Merge branch 'google:main' into main

Tungstend · web-flow · commit 314fa22006ba · 2025-01-02T19:25:40.000+08:00
diff --git a/DEPS b/DEPS
@@ -43,7 +43,7 @@ vars = {
   'checkout_angle_mesa': False,
 
   # Version of Chromium our Chromium-based DEPS are mirrored from.
-  'chromium_revision': '3d34cc12858adb0a993f444dedb4dc42f9f55fd0',
+  'chromium_revision': 'a1ed57f54522d48fc3157c780edc1c5e1f5021a1',
   # We never want to checkout chromium,
   # but need a dummy DEPS entry for the autoroller
   'dummy_checkout_chromium': False,
@@ -450,7 +450,7 @@ vars = {
 deps = {
 
   'build': {
-    'url': Var('chromium_git') + '/chromium/src/build.git@44bcc9d7b830ddf5d56e96bf8bc7fea9023bad6f',
+    'url': Var('chromium_git') + '/chromium/src/build.git@6b60728ea92e526ed2d577ff360d5beb95f87e6a',
     'condition': 'not build_with_chromium',
   },
 
@@ -847,7 +847,7 @@ deps = {
   },
 
   'third_party/llvm-libc/src': {
-    'url': Var('chromium_git') + '/external/github.com/llvm/llvm-project/libc.git@30f439e02ebf9be89259f491f647bb246fde49cc',
+    'url': Var('chromium_git') + '/external/github.com/llvm/llvm-project/libc.git@b0de9011b9f34818da12b1448f40e212f611afa3',
     'condition': 'not build_with_chromium',
   },
 
@@ -1011,7 +1011,7 @@ deps = {
   },
 
   'third_party/vulkan-deps': {
-    'url': Var('chromium_git') + '/vulkan-deps@bfa23916c97efe0f7076fca1b26d5a19b725e7d7',
+    'url': Var('chromium_git') + '/vulkan-deps@04a50a3dd7b9e98c7320cf28c1095aab5c3ad704',
     'condition': 'not build_with_chromium',
   },
 
@@ -1061,7 +1061,7 @@ deps = {
   },
 
   'third_party/vulkan-validation-layers/src': {
-    'url': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-ValidationLayers@34b85f655e7b07865ce554eb365ab8241cb8be6e',
+    'url': '{chromium_git}/external/github.com/KhronosGroup/Vulkan-ValidationLayers@d6141280aadb706f49cd46128b1dee2b3a361c2e',
     'condition': 'not build_with_chromium',
   },
 
diff --git a/build b/build
@@ -1 +1 @@
-Subproject commit 44bcc9d7b830ddf5d56e96bf8bc7fea9023bad6f
+Subproject commit 6b60728ea92e526ed2d577ff360d5beb95f87e6a
diff --git a/src/tests/egl_tests/EGLLockSurface3Test.cpp b/src/tests/egl_tests/EGLLockSurface3Test.cpp
@@ -48,6 +48,8 @@ class EGLLockSurface3Test : public ANGLETest<>
     {
         if (mDisplay != EGL_NO_DISPLAY)
         {
+            EXPECT_EGL_TRUE(
+                eglMakeCurrent(mDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT));
             eglTerminate(mDisplay);
             eglReleaseThread();
             mDisplay = EGL_NO_DISPLAY;
diff --git a/third_party/llvm-libc/src b/third_party/llvm-libc/src
@@ -1 +1 @@
-Subproject commit 30f439e02ebf9be89259f491f647bb246fde49cc
+Subproject commit b0de9011b9f34818da12b1448f40e212f611afa3
diff --git a/third_party/vulkan-deps b/third_party/vulkan-deps
@@ -1 +1 @@
-Subproject commit bfa23916c97efe0f7076fca1b26d5a19b725e7d7
+Subproject commit 04a50a3dd7b9e98c7320cf28c1095aab5c3ad704
diff --git a/third_party/vulkan-validation-layers/src b/third_party/vulkan-validation-layers/src
@@ -1 +1 @@
-Subproject commit 34b85f655e7b07865ce554eb365ab8241cb8be6e
+Subproject commit d6141280aadb706f49cd46128b1dee2b3a361c2e

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,8 @@ class EGLLockSurface3Test : public ANGLETest<>`
`48`	`48`	`{`
`49`	`49`	`if (mDisplay != EGL_NO_DISPLAY)`
`50`	`50`	`{`
	`51`	`+ EXPECT_EGL_TRUE(`
	`52`	`+ eglMakeCurrent(mDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT));`
`51`	`53`	`eglTerminate(mDisplay);`
`52`	`54`	`eglReleaseThread();`
`53`	`55`	`mDisplay = EGL_NO_DISPLAY;`