diff options
Diffstat (limited to 'xc/lib/GL/mesa/src/drv/sis/sis_xmesa.c')
| -rw-r--r-- | xc/lib/GL/mesa/src/drv/sis/sis_xmesa.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/xc/lib/GL/mesa/src/drv/sis/sis_xmesa.c b/xc/lib/GL/mesa/src/drv/sis/sis_xmesa.c index fe0780804..a3f05b947 100644 --- a/xc/lib/GL/mesa/src/drv/sis/sis_xmesa.c +++ b/xc/lib/GL/mesa/src/drv/sis/sis_xmesa.c @@ -76,17 +76,13 @@ GLboolean XMesaInitDriver (__DRIscreenPrivate * driScrnPriv) { SISDRIPtr priv = (SISDRIPtr) driScrnPriv->pDevPriv; - /* Check the DRI version */ - { - int major, minor, patch; - if (XF86DRIQueryVersion(driScrnPriv->display, &major, &minor, &patch)) { - if (major != 4 || minor < 0) { - char msg[1000]; - sprintf(msg, "sis DRI driver expected DRI version 4.0.x but got version %d.%d.%d", major, minor, patch); - __driMesaMessage(msg); - return GL_FALSE; - } - } + + /* Check the DRI externsion version */ + if ( sPriv->driMajor != 4 || sPriv->driMinor < 0 ) { + __driUtilMessage( "sis DRI driver expected DRI version 4.0.x " + "but got version %d.%d.%d", + sPriv->driMajor, sPriv->driMinor, sPriv->driPatch ); + return NULL; } /* Check that the DDX driver version is compatible */ @@ -211,7 +207,7 @@ GLvisual *XMesaCreateVisual(Display *dpy, 0 /* num samples */ ); } -GLboolean XMesaCreateContext(Display *dpy, GLvisual *mesaVis, +GLboolean XMesaCreateContext(GLvisual *mesaVis, __DRIcontextPrivate *driContextPriv) { XMesaContext c; @@ -228,12 +224,10 @@ GLboolean XMesaCreateContext(Display *dpy, GLvisual *mesaVis, if (!c->xm_visual) return GL_FALSE; c->xm_visual->gl_visual = mesaVis; - c->xm_visual->display = dpy; c->gl_ctx = driContextPriv->mesaContext; c->xm_buffer = NULL; - c->display = dpy; c->gl_ctx->Driver.UpdateState = sis_UpdateState; |