diff options
| author | Keith Whitwell <keithw@vmware.com> | 2009-06-30 16:28:37 +0100 |
|---|---|---|
| committer | Keith Whitwell <keithw@vmware.com> | 2009-06-30 16:28:54 +0100 |
| commit | 4147bb24d49a10498e00039fc1dc9aa5f1316777 (patch) | |
| tree | ceb027c40f52dd7e0471a3534bac7cd270b6953b /src/glx/x11/glxcmds.c | |
| parent | 53f8dccd0c9ab0b55e24dd5d624bbaaf0c8c284b (diff) | |
| parent | 6af783bea0e171582f86c8456ca521ac242abc39 (diff) | |
Merge branch 'mesa_7_5_branch' into dlist-statechange-shortcircuit
Need this to pick up fixes for per-vertex materials.
Diffstat (limited to 'src/glx/x11/glxcmds.c')
| -rw-r--r-- | src/glx/x11/glxcmds.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glx/x11/glxcmds.c b/src/glx/x11/glxcmds.c index 77471b8599..820d8b9868 100644 --- a/src/glx/x11/glxcmds.c +++ b/src/glx/x11/glxcmds.c @@ -164,7 +164,7 @@ GetGLXScreenConfigs(Display *dpy, int scrn) { __GLXdisplayPrivate * const priv = __glXInitialize(dpy); - return (priv->screenConfigs != NULL) ? &priv->screenConfigs[scrn] : NULL; + return (priv && priv->screenConfigs != NULL) ? &priv->screenConfigs[scrn] : NULL; } |