frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

res: Account for GLXPixmap references too 

GLX_EXT_tetxure_from_pixmap operates on a GLXPixmap, which takes a
reference on the backing pixmap; that GLXPixmap might be long-lived, so
we should account for it in ResQueryClientPixmapBytes.

Acked-by: Michel Dänzer <michel.daenzer@amd.com>
Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Adam Jackson 2016-02-02 14:10:49 -05:00
parent 5d6ad0d3a7
commit ce82ae1964
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
glx/glxext.c
View File

@ -336,6 +336,23 @@ checkScreenVisuals(void)
return False; return False;
} }
static void
GetGLXDrawableBytes(void *value, XID id, ResourceSizePtr size)
{
__GLXdrawable *draw = value;
size->resourceSize = 0;
size->pixmapRefSize = 0;
size->refCnt = 1;
if (draw->type == GLX_DRAWABLE_PIXMAP) {
SizeType pixmapSizeFunc = GetResourceTypeSizeFunc(RT_PIXMAP);
ResourceSizeRec pixmapSize = { 0, };
pixmapSizeFunc((PixmapPtr)draw->pDraw, draw->pDraw->id, &pixmapSize);
size->pixmapRefSize += pixmapSize.pixmapRefSize;
}
}
/* /*
** Initialize the GLX extension. ** Initialize the GLX extension.
*/ */
@ -365,6 +382,8 @@ GlxExtensionInit(void)
if (!__glXContextRes || !__glXDrawableRes) if (!__glXContextRes || !__glXDrawableRes)
return; return;
SetResourceTypeSizeFunc(__glXDrawableRes, GetGLXDrawableBytes);
if (!dixRegisterPrivateKey if (!dixRegisterPrivateKey
(&glxClientPrivateKeyRec, PRIVATE_CLIENT, sizeof(__GLXclientState))) (&glxClientPrivateKeyRec, PRIVATE_CLIENT, sizeof(__GLXclientState)))
return; return;