diff options
| author | backer@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-09 18:53:21 +0000 |
|---|---|---|
| committer | backer@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-09 18:53:21 +0000 |
| commit | e77900cf12df0258a89afc2bde0812350aa5f05e (patch) | |
| tree | 6eb827568b6e23102c4953d0678a5e0d1cc13cf1 /ui | |
| parent | ff559f2806eb11792c30fc54b544dcdb5ff8ae73 (diff) | |
| download | chromium_src-e77900cf12df0258a89afc2bde0812350aa5f05e.zip chromium_src-e77900cf12df0258a89afc2bde0812350aa5f05e.tar.gz chromium_src-e77900cf12df0258a89afc2bde0812350aa5f05e.tar.bz2 | |
Workaround for open source drivers.
On current open source drivers (1.9.2.901 intel and radeon pulled from X-edgers PPA), glXGetFBConfigFromVisualSGIX is not working as expected even though glxinfo lists GLX_SGIX_fbconfig as a supported extension. Rather than abort when this function fails, this simple patch tries the second code path provided when glXGetFBConfigFromVisualSGIX is unsupported.
BUG=none
TEST=by hand on Linux with 3D CSS
Review URL: http://codereview.chromium.org/6969002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84653 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/gfx/gl/gl_surface_glx.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ui/gfx/gl/gl_surface_glx.cc b/ui/gfx/gl/gl_surface_glx.cc index d9b39d4..4f33720 100644 --- a/ui/gfx/gl/gl_surface_glx.cc +++ b/ui/gfx/gl/gl_surface_glx.cc @@ -107,9 +107,10 @@ bool NativeViewGLSurfaceGLX::Initialize() { config_ = glXGetFBConfigFromVisualSGIX(g_display, visual_infos.get()); if (!config_) { LOG(ERROR) << "glXGetFBConfigFromVisualSGIX failed."; - return false; } - } else { + } + + if (!config_) { int config_id; if (glXGetConfig(g_display, visual_infos.get(), |