diff options
| author | Enrico Weigelt, metux IT consult <info@metux.net> | 2024-03-11 11:01:02 +0100 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2024-04-15 19:00:47 -0700 |
| commit | 85d4bd0dba6ac5adb73864396d260be92a23ea50 (patch) | |
| tree | 96ce7323e0fda4afacb23c2ca55d5156e21c1c5d /glx | |
| parent | 1ca48d0a48dbec38d2765d8626f7983751226966 (diff) | |
rename remaining RT_* defines to X11_RESTYPE_*
Since we already had to rename some of them, in order to fix name clashes
on win32, it's now time to rename all the remaining ones.
The old ones are still present as define's to the new ones, just for
backwards compatibility.
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1355>
Diffstat (limited to 'glx')
| -rw-r--r-- | glx/glxcmds.c | 4 | ||||
| -rw-r--r-- | glx/glxext.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/glx/glxcmds.c b/glx/glxcmds.c index 9ad99da8e..651e8d39b 100644 --- a/glx/glxcmds.c +++ b/glx/glxcmds.c @@ -1395,7 +1395,7 @@ DoCreatePbuffer(ClientPtr client, int screenNum, XID fbconfigId, if (!pPixmap) return BadAlloc; - err = XaceHook(XACE_RESOURCE_ACCESS, client, glxDrawableId, RT_PIXMAP, + err = XaceHook(XACE_RESOURCE_ACCESS, client, glxDrawableId, X11_RESTYPE_PIXMAP, pPixmap, X11_RESTYPE_NONE, NULL, DixCreateAccess); if (err != Success) { (*pGlxScreen->pScreen->DestroyPixmap) (pPixmap); @@ -1406,7 +1406,7 @@ DoCreatePbuffer(ClientPtr client, int screenNum, XID fbconfigId, * resource so it and the DRI2 drawable will be reclaimed when the * pbuffer is destroyed. */ pPixmap->drawable.id = glxDrawableId; - if (!AddResource(pPixmap->drawable.id, RT_PIXMAP, pPixmap)) + if (!AddResource(pPixmap->drawable.id, X11_RESTYPE_PIXMAP, pPixmap)) return BadAlloc; return DoCreateGLXDrawable(client, pGlxScreen, config, &pPixmap->drawable, diff --git a/glx/glxext.c b/glx/glxext.c index c3f67a5ec..585f64eda 100644 --- a/glx/glxext.c +++ b/glx/glxext.c @@ -308,7 +308,7 @@ GetGLXDrawableBytes(void *value, XID id, ResourceSizePtr size) size->refCnt = 1; if (draw->type == GLX_DRAWABLE_PIXMAP) { - SizeType pixmapSizeFunc = GetResourceTypeSizeFunc(RT_PIXMAP); + SizeType pixmapSizeFunc = GetResourceTypeSizeFunc(X11_RESTYPE_PIXMAP); ResourceSizeRec pixmapSize = { 0, }; pixmapSizeFunc((PixmapPtr)draw->pDraw, draw->pDraw->id, &pixmapSize); size->pixmapRefSize += pixmapSize.pixmapRefSize; |