From d66d7ac03a80bba3da8fcf3ffd53ce96cd82b28a Mon Sep 17 00:00:00 2001 From: Tyler Holcombe Date: Wed, 11 Dec 2024 16:17:15 -0800 Subject: [PATCH] Fully disable ANGLE (with hack) --- ui/gl/gl_display.cc | 1 + ui/ozone/platform/starboard/surface_factory_starboard.cc | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ui/gl/gl_display.cc b/ui/gl/gl_display.cc index ce97bb0b98f7..816c81cf4c69 100644 --- a/ui/gl/gl_display.cc +++ b/ui/gl/gl_display.cc @@ -727,6 +727,7 @@ bool GLDisplayEGL::InitializeDisplay(bool supports_angle, std::vector init_displays, EGLDisplayPlatform native_display, gl::GLDisplayEGL* existing_display) { + supports_angle = false; if (display_ != EGL_NO_DISPLAY) return true; diff --git a/ui/ozone/platform/starboard/surface_factory_starboard.cc b/ui/ozone/platform/starboard/surface_factory_starboard.cc index 8d0aa66d4728..4f2666f60816 100644 --- a/ui/ozone/platform/starboard/surface_factory_starboard.cc +++ b/ui/ozone/platform/starboard/surface_factory_starboard.cc @@ -26,7 +26,6 @@ std::vector SurfaceFactoryStarboard::GetAllowedGLImplementations() { return std::vector{ gl::GLImplementationParts(gl::kGLImplementationEGLGLES2), - gl::GLImplementationParts(gl::kGLImplementationEGLANGLE), }; } @@ -34,7 +33,6 @@ GLOzone* SurfaceFactoryStarboard::GetGLOzone( const gl::GLImplementationParts& implementation) { switch (implementation.gl) { case gl::kGLImplementationEGLGLES2: - case gl::kGLImplementationEGLANGLE: return egl_implementation_.get(); default: return nullptr;