[GL] Add a switch to disable Android native fence sync

https://crrev.com/c/5493084 was reverted because it broke some GL tests. For simplicity and to minimize the impact, a switch is added in this CL to disable the native fence sync on Android emulators. Bug: 337886037, 40259037 Change-Id: I63a1a5a4d956c7134b8ba44912e46c0cbc8be1f2 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5504854 Reviewed-by: Geoff Lang <[email protected]> Commit-Queue: William Liu <[email protected]> Reviewed-by: Khushal Sagar <[email protected]> Cr-Commit-Position: refs/heads/main@{#1296572}
blueboxd · May 4, 2024 · 1414d83 · 1414d83
1 parent 7c2cb63
commit 1414d83
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 0 deletions.
diff --git a/ui/gl/gl_display.cc b/ui/gl/gl_display.cc
@@ -874,6 +874,11 @@ void GLDisplayEGL::InitializeCommon(bool for_testing) {
       base::SysInfo::GetAndroidHardwareEGL() != "emulation") {
     egl_android_native_fence_sync_supported_ = true;
   }
+
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kDisableAndroidNativeFenceSyncForTesting)) {
+    egl_android_native_fence_sync_supported_ = false;
+  }
 #endif  // BUILDFLAG(IS_ANDROID)
 
   if (!for_testing) {

diff --git a/ui/gl/gl_switches.cc b/ui/gl/gl_switches.cc
@@ -168,6 +168,17 @@ const char* const kGLSwitchesCopiedFromGpuProcessHost[] = {
 const size_t kGLSwitchesCopiedFromGpuProcessHostNumSwitches =
     std::size(kGLSwitchesCopiedFromGpuProcessHost);
 
+#if BUILDFLAG(IS_ANDROID)
+// On some Android emulators with software GL, ANGLE
+// is exposing the native fence sync extension but it doesn't
+// actually work. This switch is used to disable the Android native fence sync
+// during test to avoid crashes.
+//
+// TODO(https://crbug.com/337886037): Remove this flag once the upstream ANGLE
+// is fixed.
+const char kDisableAndroidNativeFenceSyncForTesting[] =
+    "disable-android-native-fence-sync-for-testing";
+#endif
 }  // namespace switches
 
 namespace features {

diff --git a/ui/gl/gl_switches.h b/ui/gl/gl_switches.h
@@ -84,6 +84,10 @@ GL_EXPORT extern const char kOverrideUseSoftwareGLForTests[];
 GL_EXPORT extern const char* const kGLSwitchesCopiedFromGpuProcessHost[];
 GL_EXPORT extern const size_t kGLSwitchesCopiedFromGpuProcessHostNumSwitches;
 
+#if BUILDFLAG(IS_ANDROID)
+GL_EXPORT extern const char kDisableAndroidNativeFenceSyncForTesting[];
+#endif
+
 }  // namespace switches
 
 namespace features {