This repository has been archived by the owner on Apr 12, 2021. It is now read-only.
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chromium: fix GL support by not using the ANGLE GL implementation
- Loading branch information
Showing
2 changed files
with
27 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
26 changes: 26 additions & 0 deletions
26
pkgs/applications/networking/browsers/chromium/patches/dont-use-ANGLE-by-default.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
A field trial currently enables the passthrough command decoder, which causes | ||
gl_factory.cc to try kGLImplementationEGLANGLE first, which causes Chromium to fail | ||
to load libGLESv2.so on NixOS. It somehow does not try kGLImplementationDesktopGL, | ||
and so there is no GL support at all. | ||
|
||
Revert to using the validating command decoder, which prevents gl_factory.cc | ||
from touching allowed_impls, allowing it to successfully use kGLImplementationDesktopGL. | ||
|
||
diff --git a/ui/gl/gl_utils.cc b/ui/gl/gl_utils.cc | ||
index 697cbed5fe2d..8419bdb21a2f 100644 | ||
--- a/ui/gl/gl_utils.cc | ||
+++ b/ui/gl/gl_utils.cc | ||
@@ -71,9 +71,10 @@ bool UsePassthroughCommandDecoder(const base::CommandLine* command_line) { | ||
} else if (switch_value == kCmdDecoderValidatingName) { | ||
return false; | ||
} else { | ||
- // Unrecognized or missing switch, use the default. | ||
- return base::FeatureList::IsEnabled( | ||
- features::kDefaultPassthroughCommandDecoder); | ||
+ // Ignore the field trial that enables it; disable it until | ||
+ // gl_factory.cc kGLImplementationEGLANGLE issues are sorted | ||
+ // out on NixOS. | ||
+ return false; | ||
} | ||
} | ||
} |