diff options
author | Kristian Høgsberg <[email protected]> | 2008-03-08 21:02:23 -0500 |
---|---|---|
committer | Kristian Høgsberg <[email protected]> | 2008-03-08 21:02:23 -0500 |
commit | 20b9230ce1b96ca246850a8088caeffc3f391a0c (patch) | |
tree | 9259704d09a62cffedcd3bb8583f8b8325817f4a /src/glx | |
parent | 92d2a78f8d2d56cfadb4cb5323adec32fe73e353 (diff) |
Move DRI drawable creation into dri_glx.c.
Diffstat (limited to 'src/glx')
-rw-r--r-- | src/glx/x11/dri_glx.c | 49 | ||||
-rw-r--r-- | src/glx/x11/glxclient.h | 22 | ||||
-rw-r--r-- | src/glx/x11/glxcmds.c | 8 | ||||
-rw-r--r-- | src/glx/x11/glxext.c | 45 |
4 files changed, 68 insertions, 56 deletions
diff --git a/src/glx/x11/dri_glx.c b/src/glx/x11/dri_glx.c index c96356fd634..2e883c62cb7 100644 --- a/src/glx/x11/dri_glx.c +++ b/src/glx/x11/dri_glx.c @@ -413,8 +413,8 @@ __glXDRIGetDrawableInfo(__DRIdrawable *drawable, int *backX, int *backY, int *numBackClipRects, drm_clip_rect_t **pBackClipRects) { - __GLXdrawable *glxDraw = - containerOf(drawable, __GLXdrawable, driDrawable); + __GLXDRIdrawable *glxDraw = + containerOf(drawable, __GLXDRIdrawable, driDrawable); __GLXscreenConfigs *psc = glxDraw->psc; Display *dpy = psc->dpy; @@ -693,6 +693,50 @@ static void driCreateContext(__GLXscreenConfigs *psc, } } + +static __GLXDRIdrawable *driCreateDrawable(__GLXscreenConfigs *psc, + GLXDrawable drawable, + GLXContext gc) +{ + __GLXDRIdrawable *pdraw; + drm_drawable_t hwDrawable; + void *empty_attribute_list = NULL; + + pdraw = Xmalloc(sizeof(*pdraw)); + if (!pdraw) + return NULL; + + pdraw->drawable = drawable; + pdraw->psc = psc; + + if (!XF86DRICreateDrawable(psc->dpy, psc->scr, drawable, &hwDrawable)) + return NULL; + + /* Create a new drawable */ + pdraw->driDrawable.private = + (*psc->__driScreen.createNewDrawable)(&psc->__driScreen, + gc->mode, + &pdraw->driDrawable, + hwDrawable, + GLX_WINDOW_BIT, + empty_attribute_list); + + if (!pdraw->driDrawable.private) { + XF86DRIDestroyDrawable(psc->dpy, psc->scr, drawable); + Xfree(pdraw); + return NULL; + } + + if (__glxHashInsert(psc->drawHash, drawable, pdraw)) { + (*pdraw->driDrawable.destroyDrawable)(&pdraw->driDrawable); + XF86DRIDestroyDrawable(psc->dpy, psc->scr, drawable); + Xfree(pdraw); + return NULL; + } + + return pdraw; +} + static void driDestroyScreen(__GLXscreenConfigs *psc) { /* Free the direct rendering per screen data */ @@ -737,6 +781,7 @@ static __GLXDRIscreen *driCreateScreen(__GLXscreenConfigs *psc, int screen, psp->destroyScreen = driDestroyScreen; psp->createContext = driCreateContext; + psp->createDrawable = driCreateDrawable; return psp; } diff --git a/src/glx/x11/glxclient.h b/src/glx/x11/glxclient.h index b8ba4967387..d99918a185e 100644 --- a/src/glx/x11/glxclient.h +++ b/src/glx/x11/glxclient.h @@ -94,6 +94,7 @@ typedef struct _glapi_table __GLapi; */ typedef struct __GLXDRIdisplayRec __GLXDRIdisplay; typedef struct __GLXDRIscreenRec __GLXDRIscreen; +typedef struct __GLXDRIdrawableRec __GLXDRIdrawable; struct __GLXDRIdisplayRec { /** @@ -112,6 +113,16 @@ struct __GLXDRIscreenRec { void (*createContext)(__GLXscreenConfigs *psc, const __GLcontextModes *mode, GLXContext gc, GLXContext shareList, int renderType); + + __GLXDRIdrawable *(*createDrawable)(__GLXscreenConfigs *psc, + GLXDrawable drawable, + GLXContext gc); +}; + +struct __GLXDRIdrawableRec { + XID drawable; + __GLXscreenConfigs *psc; + __DRIdrawable driDrawable; }; /* @@ -541,17 +552,6 @@ struct __GLXdisplayPrivateRec { #endif }; -#ifdef GLX_DIRECT_RENDERING - -struct __GLXdrawableRec { - XID drawable; - __GLXscreenConfigs *psc; - __DRIdrawable driDrawable; -}; - -#endif - - void __glXFreeContext(__GLXcontext*); diff --git a/src/glx/x11/glxcmds.c b/src/glx/x11/glxcmds.c index 15c9d19c97d..6b34acfcf34 100644 --- a/src/glx/x11/glxcmds.c +++ b/src/glx/x11/glxcmds.c @@ -83,7 +83,7 @@ static int windowExistsErrorHandler(Display *dpy, XErrorEvent *xerr) static void GarbageCollectDRIDrawables(Display *dpy, __GLXscreenConfigs *sc) { XID draw; - __GLXdrawable *pdraw; + __GLXDRIdrawable *pdraw; XWindowAttributes xwa; int (*oldXErrorHandler)(Display *, XErrorEvent *); @@ -124,7 +124,7 @@ static __DRIdrawable * GetDRIDrawable( Display *dpy, GLXDrawable drawable, int * const scrn_num ) { __GLXdisplayPrivate * const priv = __glXInitialize(dpy); - __GLXdrawable * const pdraw; + __GLXDRIdrawable * const pdraw; const unsigned screen_count = ScreenCount(dpy); unsigned i; __GLXscreenConfigs *sc; @@ -2143,9 +2143,9 @@ __driGetMscRateOML(__DRIdrawable *draw, int32_t *numerator, int32_t *denominator XF86VidModeModeLine mode_line; int dot_clock; int i; - __GLXdrawable *glxDraw; + __GLXDRIdrawable *glxDraw; - glxDraw = containerOf(draw, __GLXdrawable, driDrawable); + glxDraw = containerOf(draw, __GLXDRIdrawable, driDrawable); psc = glxDraw->psc; if (XF86VidModeQueryVersion(psc->dpy, &i, &i) && XF86VidModeGetModeLine(psc->dpy, psc->scr, &dot_clock, &mode_line) ) { diff --git a/src/glx/x11/glxext.c b/src/glx/x11/glxext.c index 372dbfca657..2f3261801a6 100644 --- a/src/glx/x11/glxext.c +++ b/src/glx/x11/glxext.c @@ -1178,53 +1178,20 @@ static Bool SendMakeCurrentRequest(Display *dpy, CARD8 opcode, #ifdef GLX_DIRECT_RENDERING static __DRIdrawable * -FetchDRIDrawable( Display *dpy, GLXDrawable drawable, GLXContext gc) +FetchDRIDrawable(Display *dpy, GLXDrawable drawable, GLXContext gc) { __GLXdisplayPrivate * const priv = __glXInitialize(dpy); - __GLXdrawable *pdraw; - __GLXscreenConfigs *sc; - drm_drawable_t hwDrawable; - void *empty_attribute_list = NULL; + __GLXDRIdrawable *pdraw; + __GLXscreenConfigs *psc; if (priv == NULL || priv->driDisplay == NULL) return NULL; - sc = &priv->screenConfigs[gc->screen]; - if (__glxHashLookup(sc->drawHash, drawable, (void *) &pdraw) == 0) + psc = &priv->screenConfigs[gc->screen]; + if (__glxHashLookup(psc->drawHash, drawable, (void *) &pdraw) == 0) return &pdraw->driDrawable; - /* Allocate a new drawable */ - pdraw = Xmalloc(sizeof(*pdraw)); - if (!pdraw) - return NULL; - - pdraw->drawable = drawable; - pdraw->psc = sc; - - if (!XF86DRICreateDrawable(dpy, sc->scr, drawable, &hwDrawable)) - return NULL; - - /* Create a new drawable */ - pdraw->driDrawable.private = - (*sc->__driScreen.createNewDrawable)(&sc->__driScreen, - gc->mode, - &pdraw->driDrawable, - hwDrawable, - GLX_WINDOW_BIT, - empty_attribute_list); - - if (!pdraw->driDrawable.private) { - XF86DRIDestroyDrawable(dpy, sc->scr, drawable); - Xfree(pdraw); - return NULL; - } - - if (__glxHashInsert(sc->drawHash, drawable, pdraw)) { - (*pdraw->driDrawable.destroyDrawable)(&pdraw->driDrawable); - XF86DRIDestroyDrawable(dpy, sc->scr, drawable); - Xfree(pdraw); - return NULL; - } + pdraw = psc->driScreen->createDrawable(psc, drawable, gc); return &pdraw->driDrawable; } |