diff options
| author | Kristian Høgsberg <[email protected]> | 2010-07-22 22:36:37 -0400 |
|---|---|---|
| committer | Kristian Høgsberg <[email protected]> | 2010-07-22 22:36:37 -0400 |
| commit | eeaab2047cfce8a7445fd9f835e737682eb503ac (patch) | |
| tree | 8d84c9b7d03c4239077d4e8e4e7ac5aabb18faaa /src/glx/glx_pbuffer.c | |
| parent | 7b7845a076c933e096ac511b4184141ba194449a (diff) | |
glx: Drop screen argument to GetGLXDRIDrawable
We'll just get it from the returned drawable when we need it.
Diffstat (limited to 'src/glx/glx_pbuffer.c')
| -rw-r--r-- | src/glx/glx_pbuffer.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/glx/glx_pbuffer.c b/src/glx/glx_pbuffer.c index 171ede4660a..02809aacfa5 100644 --- a/src/glx/glx_pbuffer.c +++ b/src/glx/glx_pbuffer.c @@ -95,7 +95,7 @@ ChangeDrawableAttribute(Display * dpy, GLXDrawable drawable, return; } - pdraw = GetGLXDRIDrawable(dpy, drawable, NULL); + pdraw = GetGLXDRIDrawable(dpy, drawable); opcode = __glXSetupForCommand(dpy); if (!opcode) @@ -214,14 +214,12 @@ CreateDRIDrawable(Display *dpy, const __GLcontextModes *fbconfig, static void DestroyDRIDrawable(Display *dpy, GLXDrawable drawable, int destroy_xdrawable) { - int screen; __GLXdisplayPrivate *const priv = __glXInitialize(dpy); - __GLXDRIdrawable *pdraw = GetGLXDRIDrawable(dpy, drawable, &screen); - __GLXscreenConfigs *psc = priv->screenConfigs[screen]; + __GLXDRIdrawable *pdraw = GetGLXDRIDrawable(dpy, drawable); if (pdraw != NULL) { if (destroy_xdrawable) - XFreePixmap(psc->dpy, pdraw->xDrawable); + XFreePixmap(pdraw->psc->dpy, pdraw->xDrawable); (*pdraw->destroyDrawable) (pdraw); __glxHashDelete(priv->drawHash, drawable); } @@ -341,7 +339,7 @@ GetDrawableAttribute(Display * dpy, GLXDrawable drawable, #if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL) { - __GLXDRIdrawable *pdraw = GetGLXDRIDrawable(dpy, drawable, NULL); + __GLXDRIdrawable *pdraw = GetGLXDRIDrawable(dpy, drawable); if (pdraw != NULL && !pdraw->textureTarget) pdraw->textureTarget = |