From 1960182ece3f1eca06d2e439f64dd61be8a03ff5 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Wed, 2 Jun 2004 22:24:00 +0000 Subject: [PATCH] Require libGL API version 20040602, which actually exports __glXGetDrawableInfo. Make sure driCreateNewDrawable sets pdraw->private to NULL for all failure paths. --- src/mesa/drivers/dri/common/dri_util.c | 6 ++++-- 1 file 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 -- 2.30.2