OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glx: Drop screen argument to GetGLXDRIDrawable

Browse Source 
We'll just get it from the returned drawable when we need it.
This commit is contained in:
Kristian Høgsberg
2010-07-22 22:36:37 -04:00
parent 7b7845a076
commit eeaab2047c
4 changed files with 33 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/glx/glx_pbuffer.c
View File

@@ -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 =