summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorIan Romanick <idr@us.ibm.com>2004-06-02 22:24:00 +0000
committerIan Romanick <idr@us.ibm.com>2004-06-02 22:24:00 +0000
commit1960182ece3f1eca06d2e439f64dd61be8a03ff5 (patch)
tree80c3975ebb86a322c6d109077da06a674a3c414b /src/mesa
parent5c113461df885d2de7eae405e058fb97cf4028dc (diff)
Require libGL API version 20040602, which actually exports
__glXGetDrawableInfo. Make sure driCreateNewDrawable sets pdraw->private to NULL for all failure paths.
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/dri/common/dri_util.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c
index 8af4c0a50a3..05bfce8f532 100644
--- a/src/mesa/drivers/dri/common/dri_util.c
+++ b/src/mesa/drivers/dri/common/dri_util.c
@@ -783,6 +783,8 @@ static void *driCreateNewDrawable(__DRInativeDisplay *dpy,
__DRIdrawablePrivate *pdp;
+ pdraw->private = NULL;
+
/* Since pbuffers are not yet supported, no drawable attributes are
* supported either.
*/
@@ -1174,9 +1176,9 @@ __driUtilCreateNewScreen(__DRInativeDisplay *dpy, int scrn, __DRIscreen *psc,
#ifdef DRI_NEW_INTERFACE_ONLY
- if ( internal_api_version < 20040415 ) {
+ if ( internal_api_version < 20040602 ) {
fprintf( stderr, "libGL error: libGL.so version (%08u) is too old. "
- "20040415 or later is required.\n", internal_api_version );
+ "20040602 or later is required.\n", internal_api_version );
return NULL;
}
#else