diff options
Diffstat (limited to 'src/glx')
| -rw-r--r-- | src/glx/x11/dri2_glx.c | 10 | ||||
| -rw-r--r-- | src/glx/x11/glxcmds.c | 12 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/glx/x11/dri2_glx.c b/src/glx/x11/dri2_glx.c index d5d5a07fee3..89efe3ab292 100644 --- a/src/glx/x11/dri2_glx.c +++ b/src/glx/x11/dri2_glx.c @@ -159,7 +159,7 @@ dri2DestroyDrawable(__GLXDRIdrawable * pdraw) const __DRIcoreExtension *core = pdraw->psc->core; (*core->destroyDrawable) (pdraw->driDrawable); - DRI2DestroyDrawable(pdraw->psc->dpy, pdraw->drawable); + DRI2DestroyDrawable(pdraw->psc->dpy, pdraw->xDrawable); Xfree(pdraw); } @@ -189,7 +189,7 @@ dri2CreateDrawable(__GLXscreenConfigs * psc, config->driConfig, pdraw); if (!pdraw->base.driDrawable) { - DRI2DestroyDrawable(psc->dpy, drawable); + DRI2DestroyDrawable(psc->dpy, xDrawable); Xfree(pdraw); return NULL; } @@ -221,7 +221,7 @@ dri2CopySubBuffer(__GLXDRIdrawable * pdraw, region = XFixesCreateRegion(pdraw->psc->dpy, &xrect, 1); /* should get a fence ID back from here at some point */ - DRI2CopyRegion(pdraw->psc->dpy, pdraw->drawable, region, + DRI2CopyRegion(pdraw->psc->dpy, pdraw->xDrawable, region, DRI2BufferFrontLeft, DRI2BufferBackLeft); XFixesDestroyRegion(pdraw->psc->dpy, region); @@ -261,7 +261,7 @@ dri2WaitX(__GLXDRIdrawable * pdraw) #endif region = XFixesCreateRegion(pdraw->psc->dpy, &xrect, 1); - DRI2CopyRegion(pdraw->psc->dpy, pdraw->drawable, region, + DRI2CopyRegion(pdraw->psc->dpy, pdraw->xDrawable, region, DRI2BufferFakeFrontLeft, DRI2BufferFrontLeft); XFixesDestroyRegion(pdraw->psc->dpy, region); } @@ -287,7 +287,7 @@ dri2WaitGL(__GLXDRIdrawable * pdraw) #endif region = XFixesCreateRegion(pdraw->psc->dpy, &xrect, 1); - DRI2CopyRegion(pdraw->psc->dpy, pdraw->drawable, region, + DRI2CopyRegion(pdraw->psc->dpy, pdraw->xDrawable, region, DRI2BufferFrontLeft, DRI2BufferFakeFrontLeft); XFixesDestroyRegion(pdraw->psc->dpy, region); } diff --git a/src/glx/x11/glxcmds.c b/src/glx/x11/glxcmds.c index 7eb23dbacab..2efe1919820 100644 --- a/src/glx/x11/glxcmds.c +++ b/src/glx/x11/glxcmds.c @@ -1960,7 +1960,7 @@ __glXBeginFrameTrackingMESA(Display * dpy, GLXDrawable drawable) { int status = GLX_BAD_CONTEXT; #ifdef __DRI_FRAME_TRACKING - int screen; + int screen = 0; __GLXDRIdrawable *pdraw = GetGLXDRIDrawable(dpy, drawable, &screen); __GLXscreenConfigs *const psc = GetGLXScreenConfigs(dpy, screen); @@ -1979,7 +1979,7 @@ __glXEndFrameTrackingMESA(Display * dpy, GLXDrawable drawable) { int status = GLX_BAD_CONTEXT; #ifdef __DRI_FRAME_TRACKING - int screen; + int screen = 0; __GLXDRIdrawable *pdraw = GetGLXDRIDrawable(dpy, drawable, &screen); __GLXscreenConfigs *psc = GetGLXScreenConfigs(dpy, screen); @@ -1999,7 +1999,7 @@ __glXGetFrameUsageMESA(Display * dpy, GLXDrawable drawable, GLfloat * usage) { int status = GLX_BAD_CONTEXT; #ifdef __DRI_FRAME_TRACKING - int screen; + int screen = 0; __GLXDRIdrawable *const pdraw = GetGLXDRIDrawable(dpy, drawable, &screen); __GLXscreenConfigs *const psc = GetGLXScreenConfigs(dpy, screen); @@ -2029,7 +2029,7 @@ __glXQueryFrameTrackingMESA(Display * dpy, GLXDrawable drawable, { int status = GLX_BAD_CONTEXT; #ifdef __DRI_FRAME_TRACKING - int screen; + int screen = 0; __GLXDRIdrawable *pdraw = GetGLXDRIDrawable(dpy, drawable, &screen); __GLXscreenConfigs *const psc = GetGLXScreenConfigs(dpy, screen); @@ -2213,7 +2213,7 @@ PUBLIC GLXFBConfigSGIX glXGetFBConfigFromVisualSGIX(Display * dpy, XVisualInfo * vis) { __GLXdisplayPrivate *priv; - __GLXscreenConfigs *psc; + __GLXscreenConfigs *psc = NULL; if ((GetGLXPrivScreenConfig(dpy, vis->screen, &priv, &psc) != Success) && __glXExtensionBitIsEnabled(psc, SGIX_fbconfig_bit) @@ -2432,7 +2432,7 @@ __glXWaitForMscOML(Display * dpy, GLXDrawable drawable, int64_t * msc, int64_t * sbc) { #ifdef __DRI_MEDIA_STREAM_COUNTER - int screen; + int screen = 0; __GLXDRIdrawable *pdraw = GetGLXDRIDrawable(dpy, drawable, &screen); __GLXscreenConfigs *const psc = GetGLXScreenConfigs(dpy, screen); int ret; |