diff options
| author | kbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-02 19:07:05 +0000 |
|---|---|---|
| committer | kbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-02 19:07:05 +0000 |
| commit | 74c66a6f8e7ee4730885cc79c88d64ba2fc3cb3d (patch) | |
| tree | 6dee338407fde5008a41981c37554bd07a6af51b /third_party/glew/include/GL | |
| parent | c5874d55686f444954222f604bd79ff15d7a4325 (diff) | |
| download | chromium_src-74c66a6f8e7ee4730885cc79c88d64ba2fc3cb3d.zip chromium_src-74c66a6f8e7ee4730885cc79c88d64ba2fc3cb3d.tar.gz chromium_src-74c66a6f8e7ee4730885cc79c88d64ba2fc3cb3d.tar.bz2 | |
Fixed GPU process startup crash on Linux. Because there was no current
OpenGL context, glXGetCurrentDisplay() was returning NULL, leading to
crashes in glXQueryVersion. Exposed a new glxewContextInitWithDisplay
from GLEW allowing the caller to supply the display connection.
Built both with and without GLEW_MX to ensure GLEW changes compile in
both scenarios.
BUG=40148
TEST=ran WebGL demos in debugger, verified Display* passed to glXQueryVersion
Review URL: http://codereview.chromium.org/1556015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43507 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/glew/include/GL')
| -rw-r--r-- | third_party/glew/include/GL/glxew.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/third_party/glew/include/GL/glxew.h b/third_party/glew/include/GL/glxew.h index bece8ce..d37afd6 100644 --- a/third_party/glew/include/GL/glxew.h +++ b/third_party/glew/include/GL/glxew.h @@ -1415,6 +1415,7 @@ GLXEW_EXPORT GLboolean __GLXEW_SUN_video_resize; typedef struct GLXEWContextStruct GLXEWContext; extern GLenum glxewContextInit (GLXEWContext* ctx); +extern GLenum glxewContextInitWithDisplay (Display* dpy, GLXEWContext* ctx); extern GLboolean glxewContextIsSupported (GLXEWContext* ctx, const char* name); #define glxewInit() glxewContextInit(glxewGetContext()) @@ -1429,12 +1430,12 @@ extern GLboolean glxewContextIsSupported (GLXEWContext* ctx, const char* name); #define GLXEW_GET_FUN(x) x extern GLenum glxewInit (); -extern GLenum glxewContextInit (); +extern GLenum glxewContextInitWithDisplay (Display* dpy); extern GLboolean glxewIsSupported (const char* name); #endif /* GLEW_MX */ -extern GLboolean glxewGetExtension (const char* name); +extern GLboolean glxewGetExtension (Display* dpy, const char* name); #ifdef __cplusplus } |