diff options
author | Kristian Høgsberg <krh@redhat.com> | 2007-10-12 19:35:04 -0400 |
---|---|---|
committer | Kristian Høgsberg <krh@redhat.com> | 2007-10-12 19:35:04 -0400 |
commit | f9c6dfc4d12451c21f39f38b048758cbee5723cf (patch) | |
tree | 5384315d9ec06a779137c63b54d6326dbc12ef81 /src/mesa/drivers/dri/s3v/s3v_xmesa.c | |
parent | bf805d3bf5bf191aa669b6155316a78917cf9b0e (diff) | |
parent | a2494462cb7d557a7643452c720e0ab8fa9f4f63 (diff) |
Merge branch 'dri2'
Conflicts:
src/mesa/drivers/dri/i915/intel_screen.c
Diffstat (limited to 'src/mesa/drivers/dri/s3v/s3v_xmesa.c')
-rw-r--r-- | src/mesa/drivers/dri/s3v/s3v_xmesa.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/s3v/s3v_xmesa.c b/src/mesa/drivers/dri/s3v/s3v_xmesa.c index c66fd6dac3..7b0b006b69 100644 --- a/src/mesa/drivers/dri/s3v/s3v_xmesa.c +++ b/src/mesa/drivers/dri/s3v/s3v_xmesa.c @@ -329,7 +329,6 @@ s3vUnbindContext( __DRIcontextPrivate *driContextPriv ) static struct __DriverAPIRec s3vAPI = { - s3vInitDriver, s3vDestroyScreen, s3vCreateContext, s3vDestroyContext, @@ -355,6 +354,9 @@ void *__driCreateScreen(Display *dpy, int scrn, __DRIscreen *psc, DEBUG(("__driCreateScreen: psp = %p\n", psp)); psp = __driUtilCreateScreen(dpy, scrn, psc, numConfigs, config, &s3vAPI); DEBUG(("__driCreateScreen: psp = %p\n", psp)); + if (!s3vInitDriver(psp)) + return NULLL + return (void *) psp; } #endif |