diff options
| author | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-22 01:39:12 +0000 |
|---|---|---|
| committer | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-22 01:39:12 +0000 |
| commit | 70518b1c9ad7be6a1c6dbaf3fb1da9edd76d394c (patch) | |
| tree | 232b70639271f88edd37e43025c10eef831aa0f2 | |
| parent | fb15497e711b3e52428bf8f5e50b901810029f8a (diff) | |
| download | chromium_src-70518b1c9ad7be6a1c6dbaf3fb1da9edd76d394c.zip chromium_src-70518b1c9ad7be6a1c6dbaf3fb1da9edd76d394c.tar.gz chromium_src-70518b1c9ad7be6a1c6dbaf3fb1da9edd76d394c.tar.bz2 | |
Fix preferred order of GL implementations.
r111013 inadvertently made non-Wayland builds prefer Mesa's
off-screen renderer over GL and EGL.
BUG=none
TEST=did an aura build and checked that it wasn't incredibly slow
Review URL: http://codereview.chromium.org/8623009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111073 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ui/gfx/gl/gl_implementation_linux.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ui/gfx/gl/gl_implementation_linux.cc b/ui/gfx/gl/gl_implementation_linux.cc index ee225b19d..17575cd 100644 --- a/ui/gfx/gl/gl_implementation_linux.cc +++ b/ui/gfx/gl/gl_implementation_linux.cc @@ -58,10 +58,12 @@ base::LazyInstance<base::Lock, void GetAllowedGLImplementations(std::vector<GLImplementation>* impls) { #if !defined(USE_WAYLAND) - impls->push_back(kGLImplementationOSMesaGL); impls->push_back(kGLImplementationDesktopGL); #endif impls->push_back(kGLImplementationEGLGLES2); +#if !defined(USE_WAYLAND) + impls->push_back(kGLImplementationOSMesaGL); +#endif } bool InitializeGLBindings(GLImplementation implementation) { |