diff options
| author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-14 19:52:33 +0000 |
|---|---|---|
| committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-14 19:52:33 +0000 |
| commit | 07c11a7688f9677967eae04b237c38c6166420c1 (patch) | |
| tree | e526d77c746334f87d2f87ae2dfab774760b865f /app/gfx/gl/gl_context_linux.cc | |
| parent | a3bb1a6c553b17964e4e8ee9041b7dff7191364e (diff) | |
| download | chromium_src-07c11a7688f9677967eae04b237c38c6166420c1.zip chromium_src-07c11a7688f9677967eae04b237c38c6166420c1.tar.gz chromium_src-07c11a7688f9677967eae04b237c38c6166420c1.tar.bz2 | |
Revert 71472 - Use GL rather than EGL by default on linux.
Debug Chromium builds display an error if they don't find EGL, even if GLX is available. This prompts people to install the EGL packages, even though that probably isn't their issue.
Also, it looks like EGL, even if available, has some issues.
If GLX isn't available, it still falls back to EGL.
--use-gl=desktop should not be required to force use of GLX on boxes that also have EGL installed.
Changed LOG(ERROR) to VLOG(1) if a shared library fails to load since this is not necessarily an error. Report an error only if no GL implementation can be initialized. Log which GL implementation was selected.
TEST=launch chrome with various combinations of --use-gl switch and check the log output is correct.
BUG=none
Review URL: http://codereview.chromium.org/6342001
TBR=apatrick@chromium.org
Review URL: http://codereview.chromium.org/6314005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71474 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/gfx/gl/gl_context_linux.cc')
| -rw-r--r-- | app/gfx/gl/gl_context_linux.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/gfx/gl/gl_context_linux.cc b/app/gfx/gl/gl_context_linux.cc index 5fa77ce..0f28a1d 100644 --- a/app/gfx/gl/gl_context_linux.cc +++ b/app/gfx/gl/gl_context_linux.cc @@ -188,8 +188,8 @@ bool GLContext::InitializeOneOff() { return true; static const GLImplementation kAllowedGLImplementations[] = { - kGLImplementationDesktopGL, kGLImplementationEGLGLES2, + kGLImplementationDesktopGL, kGLImplementationOSMesaGL }; |