diff options
Diffstat (limited to 'src/glx/drisw_glx.c')
-rw-r--r-- | src/glx/drisw_glx.c | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c index 5c7f40cdffa..2eaa3c59348 100644 --- a/src/glx/drisw_glx.c +++ b/src/glx/drisw_glx.c @@ -128,13 +128,11 @@ swrastGetDrawableInfo(__DRIdrawable * draw, Drawable drawable; Window root; - Status stat; unsigned uw, uh, bw, depth; drawable = pdraw->xDrawable; - stat = XGetGeometry(dpy, drawable, &root, - x, y, &uw, &uh, &bw, &depth); + XGetGeometry(dpy, drawable, &root, x, y, &uw, &uh, &bw, &depth); *w = uw; *h = uh; } @@ -340,7 +338,7 @@ drisw_create_context(struct glx_screen *base, } static void -driDestroyDrawable(__GLXDRIdrawable * pdraw) +driswDestroyDrawable(__GLXDRIdrawable * pdraw) { struct drisw_drawable *pdp = (struct drisw_drawable *) pdraw; struct drisw_screen *psc = (struct drisw_screen *) pdp->base.psc; @@ -352,8 +350,8 @@ driDestroyDrawable(__GLXDRIdrawable * pdraw) } static __GLXDRIdrawable * -driCreateDrawable(struct glx_screen *base, XID xDrawable, - GLXDrawable drawable, struct glx_config *modes) +driswCreateDrawable(struct glx_screen *base, XID xDrawable, + GLXDrawable drawable, struct glx_config *modes) { struct drisw_drawable *pdp; __GLXDRIconfigPrivate *config = (__GLXDRIconfigPrivate *) modes; @@ -386,14 +384,14 @@ driCreateDrawable(struct glx_screen *base, XID xDrawable, return NULL; } - pdp->base.destroyDrawable = driDestroyDrawable; + pdp->base.destroyDrawable = driswDestroyDrawable; return &pdp->base; } static int64_t -driSwapBuffers(__GLXDRIdrawable * pdraw, - int64_t target_msc, int64_t divisor, int64_t remainder) +driswSwapBuffers(__GLXDRIdrawable * pdraw, + int64_t target_msc, int64_t divisor, int64_t remainder) { struct drisw_drawable *pdp = (struct drisw_drawable *) pdraw; struct drisw_screen *psc = (struct drisw_screen *) pdp->base.psc; @@ -408,7 +406,7 @@ driSwapBuffers(__GLXDRIdrawable * pdraw, } static void -driDestroyScreen(struct glx_screen *base) +driswDestroyScreen(struct glx_screen *base) { struct drisw_screen *psc = (struct drisw_screen *) base; @@ -439,7 +437,7 @@ static const struct glx_screen_vtable drisw_screen_vtable = { }; static struct glx_screen * -driCreateScreen(int screen, struct glx_display *priv) +driswCreateScreen(int screen, struct glx_display *priv) { __GLXDRIscreen *psp; const __DRIconfig **driver_configs; @@ -497,9 +495,9 @@ driCreateScreen(int screen, struct glx_display *priv) psc->base.vtable = &drisw_screen_vtable; psp = &psc->vtable; psc->base.driScreen = psp; - psp->destroyScreen = driDestroyScreen; - psp->createDrawable = driCreateDrawable; - psp->swapBuffers = driSwapBuffers; + psp->destroyScreen = driswDestroyScreen; + psp->createDrawable = driswCreateDrawable; + psp->swapBuffers = driswSwapBuffers; return &psc->base; @@ -517,7 +515,7 @@ driCreateScreen(int screen, struct glx_display *priv) /* Called from __glXFreeDisplayPrivate. */ static void -driDestroyDisplay(__GLXDRIdisplay * dpy) +driswDestroyDisplay(__GLXDRIdisplay * dpy) { Xfree(dpy); } @@ -536,8 +534,8 @@ driswCreateDisplay(Display * dpy) if (pdpyp == NULL) return NULL; - pdpyp->base.destroyDisplay = driDestroyDisplay; - pdpyp->base.createScreen = driCreateScreen; + pdpyp->base.destroyDisplay = driswDestroyDisplay; + pdpyp->base.createScreen = driswCreateScreen; return &pdpyp->base; } |