fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-27 09:50:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

st/glx: remove the duplicated Drawable member.

Browse source 
If you want to access it, you should use the Drawable in xlib_drawable instead.
This commit is contained in:
Stéphane Marchesin 2011-10-05 17:36:32 -07:00
parent 684b701c12
commit c3ef232315
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/gallium/state_trackers/glx/xlib/glx_api.c
View file

@ -1259,7 +1259,7 @@ glXCreateGLXPixmap( Display *dpy, XVisualInfo *visinfo, Pixmap pixmap )
if (!b) {
return 0;
}
return b->drawable;
return b->ws.drawable;
}
@ -1285,7 +1285,7 @@ glXCreateGLXPixmapMESA( Display *dpy, XVisualInfo *visinfo,
if (!b) {
return 0;
}
return b->drawable;
return b->ws.drawable;
}
@ -2036,7 +2036,7 @@ glXCreatePbuffer(Display *dpy, GLXFBConfig config, const int *attribList)
if (xmbuf) {
xmbuf->largestPbuffer = useLargest;
xmbuf->preservedContents = preserveContents;
return (GLXPbuffer) xmbuf->drawable;
return (GLXPbuffer) xmbuf->ws.drawable;
}
else {
return 0;
@ -2310,7 +2310,7 @@ glXCreateGLXPixmapWithConfigSGIX(Display *dpy, GLXFBConfigSGIX config,
{
XMesaVisual xmvis = (XMesaVisual) config;
XMesaBuffer xmbuf = XMesaCreatePixmapBuffer(xmvis, pixmap, 0);
return xmbuf->drawable; /* need to return an X ID */
return xmbuf->ws.drawable; /* need to return an X ID */
}
@ -2390,7 +2390,7 @@ glXCreateGLXPbufferSGIX(Display *dpy, GLXFBConfigSGIX config,
/* A GLXPbuffer handle must be an X Drawable because that's what
* glXMakeCurrent takes.
*/
return (GLXPbuffer) xmbuf->drawable;
return (GLXPbuffer) xmbuf->ws.drawable;
}

2
src/gallium/state_trackers/glx/xlib/xm_api.c
View file

@ -448,7 +448,7 @@ create_xmesa_buffer(Drawable d, BufferType type,
if (!b)
return NULL;
b->ws.drawable = b->drawable = d;
b->ws.drawable = d;
b->ws.visual = vis->visinfo->visual;
b->ws.depth = vis->visinfo->depth;

1
src/gallium/state_trackers/glx/xlib/xm_api.h
View file

@ -329,7 +329,6 @@ struct xmesa_buffer {
GLboolean wasCurrent; /* was ever the current buffer? */
XMesaVisual xm_visual; /* the X/Mesa visual */
Drawable drawable; /* Usually the X window ID */
Colormap cmap; /* the X colormap */
BufferType type; /* window, pixmap, pbuffer or glxwindow */