diff options
| author | Kristian Høgsberg <krh@hinata.boston.redhat.com> | 2007-05-14 16:58:37 -0400 |
|---|---|---|
| committer | Kristian Høgsberg <krh@redhat.com> | 2007-10-10 18:36:14 -0400 |
| commit | 64106d0d9aeefa6974317042b6bc3e5eaabac5a2 (patch) | |
| tree | d681b4562be269dea70b2d7727f7a263dacf699d /src/mesa/drivers/dri/s3v/s3v_xmesa.c | |
| parent | efd03a278ae55b454509e9659c42899133983ebd (diff) | |
Pull createNewScreen entry point into dri_util.c.
This pulls the top level createNewScreen entry point out of the drivers
and rewrites __driUtilCreateNewScreen in dri_util.c to be the new entry point.
The change moves more logic into the common/ layer and changes the
createNewScreen entry point to only be defined in one place.
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 |