fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-01 12:28:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa/xlib: fix glXQueryDrawable() bugs, see bug 24320

Browse source
This commit is contained in:
Brian Paul 2009-10-07 09:40:22 -06:00
parent 0526100a5c
commit c3eef6021a
2 changed files with 28 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/mesa/drivers/x11/fakeglx.c
View file

@ -2351,32 +2351,42 @@ Fake_glXCreatePbuffer( Display *dpy, GLXFBConfig config,
break;
case GLX_PRESERVED_CONTENTS:
attrib++;
preserveContents = *attrib; /* ignored */
preserveContents = *attrib;
break;
case GLX_LARGEST_PBUFFER:
attrib++;
useLargest = *attrib; /* ignored */
useLargest = *attrib;
break;
default:
return 0;
}
}
/* not used at this time */
(void) useLargest;
(void) preserveContents;
if (width == 0 || height == 0)
return 0;
if (width > MAX_WIDTH || height > MAX_HEIGHT) {
/* If allocation would have failed and GLX_LARGEST_PBUFFER is set,
* allocate the largest possible buffer.
*/
if (useLargest) {
width = MAX_WIDTH;
height = MAX_HEIGHT;
}
}
xmbuf = XMesaCreatePBuffer( xmvis, 0, width, height);
/* A GLXPbuffer handle must be an X Drawable because that's what
* glXMakeCurrent takes.
*/
if (xmbuf)
if (xmbuf) {
xmbuf->largestPbuffer = useLargest;
xmbuf->preservedContents = preserveContents;
return (GLXPbuffer) xmbuf->frontxrb->pixmap;
else
}
else {
return 0;
}
}
@ -2398,6 +2408,9 @@ Fake_glXQueryDrawable( Display *dpy, GLXDrawable draw, int attribute,
if (!xmbuf)
return;
/* make sure buffer's dimensions are up to date */
xmesa_check_and_update_buffer_size(NULL, xmbuf);
switch (attribute) {
case GLX_WIDTH:
*value = xmbuf->mesa_buffer.Width;
@ -2406,10 +2419,10 @@ Fake_glXQueryDrawable( Display *dpy, GLXDrawable draw, int attribute,
*value = xmbuf->mesa_buffer.Height;
break;
case GLX_PRESERVED_CONTENTS:
*value = True;
*value = xmbuf->preservedContents;
break;
case GLX_LARGEST_PBUFFER:
*value = xmbuf->mesa_buffer.Width * xmbuf->mesa_buffer.Height;
*value = xmbuf->largestPbuffer;
break;
case GLX_FBCONFIG_ID:
*value = xmbuf->xm_visual->visinfo->visualid;
@ -2766,10 +2779,10 @@ Fake_glXQueryGLXPbufferSGIX(Display *dpy, GLXPbufferSGIX pbuf, int attribute, un
switch (attribute) {
case GLX_PRESERVED_CONTENTS_SGIX:
*value = True;
*value = xmbuf->preservedContents;
break;
case GLX_LARGEST_PBUFFER_SGIX:
*value = xmbuf->mesa_buffer.Width * xmbuf->mesa_buffer.Height;
*value = xmbuf->largestPbuffer;
break;
case GLX_WIDTH_SGIX:
*value = xmbuf->mesa_buffer.Width;

3
src/mesa/drivers/x11/xmesaP.h
View file

@ -212,6 +212,9 @@ struct xmesa_buffer {
XMesaDisplay *display;
BufferType type; /* window, pixmap, pbuffer or glxwindow */
GLboolean largestPbuffer; /**< for pbuffers */
GLboolean preservedContents; /**< for pbuffers */
struct xmesa_renderbuffer *frontxrb; /* front color renderbuffer */
struct xmesa_renderbuffer *backxrb; /* back color renderbuffer */