Mesa (main): glx: no need to create extra pixmap for pbuffer
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue Dec 7 05:14:55 UTC 2021
Module: Mesa
Branch: main
Commit: bc8a51a79a5fc9981fd99c0d450c08630bfb7127
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bc8a51a79a5fc9981fd99c0d450c08630bfb7127
Author: Qiang Yu <yuq825 at gmail.com>
Date: Tue Nov 9 15:41:08 2021 +0800
glx: no need to create extra pixmap for pbuffer
XServer already created a pixmap with same id as pbuffer,
so that other client can use the pbuffer id to do
glXMakeCurrent(). But with a hidden pixmap, we can't do
this.
Reviewed-by: Adam Jackson <ajax at redhat.com>
Signed-off-by: Qiang Yu <yuq825 at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13750>
---
src/glx/glx_pbuffer.c | 22 +++++-----------------
1 file changed, 5 insertions(+), 17 deletions(-)
diff --git a/src/glx/glx_pbuffer.c b/src/glx/glx_pbuffer.c
index ff699bd1a0f..29f11ae2004 100644
--- a/src/glx/glx_pbuffer.c
+++ b/src/glx/glx_pbuffer.c
@@ -205,19 +205,15 @@ CreateDRIDrawable(Display *dpy, struct glx_config *config,
}
static void
-DestroyDRIDrawable(Display *dpy, GLXDrawable drawable, int destroy_xdrawable)
+DestroyDRIDrawable(Display *dpy, GLXDrawable drawable)
{
#ifdef GLX_DIRECT_RENDERING
struct glx_display *const priv = __glXInitialize(dpy);
__GLXDRIdrawable *pdraw = GetGLXDRIDrawable(dpy, drawable);
- XID xid;
if (priv != NULL && pdraw != NULL) {
- xid = pdraw->xDrawable;
(*pdraw->destroyDrawable) (pdraw);
__glxHashDelete(priv->drawHash, drawable);
- if (destroy_xdrawable)
- XFreePixmap(priv->dpy, xid);
}
#endif
}
@@ -514,7 +510,7 @@ DestroyDrawable(Display * dpy, GLXDrawable drawable, CARD32 glxCode)
protocolDestroyDrawable(dpy, drawable, glxCode);
DestroyGLXDrawable(dpy, drawable);
- DestroyDRIDrawable(dpy, drawable, GL_FALSE);
+ DestroyDRIDrawable(dpy, drawable);
return;
}
@@ -540,9 +536,7 @@ CreatePbuffer(Display * dpy, struct glx_config *config,
CARD32 *data;
CARD8 opcode;
unsigned int i;
- Pixmap pixmap;
GLboolean glx_1_3 = GL_FALSE;
- int depth = config->rgbBits;
if (priv == NULL)
return None;
@@ -607,15 +601,9 @@ CreatePbuffer(Display * dpy, struct glx_config *config,
UnlockDisplay(dpy);
SyncHandle();
- if (depth == 30)
- depth = 32;
-
- pixmap = XCreatePixmap(dpy, RootWindow(dpy, config->screen),
- width, height, depth);
-
- if (!CreateDRIDrawable(dpy, config, pixmap, id, attrib_list, i)) {
+ /* xserver created a pixmap with the same id as pbuffer */
+ if (!CreateDRIDrawable(dpy, config, id, id, attrib_list, i)) {
CARD32 o = glx_1_3 ? X_GLXDestroyPbuffer : X_GLXvop_DestroyGLXPbufferSGIX;
- XFreePixmap(dpy, pixmap);
protocolDestroyDrawable(dpy, id, o);
id = None;
}
@@ -674,7 +662,7 @@ DestroyPbuffer(Display * dpy, GLXDrawable drawable)
UnlockDisplay(dpy);
SyncHandle();
- DestroyDRIDrawable(dpy, drawable, GL_TRUE);
+ DestroyDRIDrawable(dpy, drawable);
return;
}
More information about the mesa-commit
mailing list