Browse Source

st/glx: remove the duplicated Drawable member.

If you want to access it, you should use the Drawable in xlib_drawable instead.
tags/mesa-8.0-rc1
Stéphane Marchesin 14 years ago
parent
commit
c3ef232315

+ 5
- 5
src/gallium/state_trackers/glx/xlib/glx_api.c View File

if (!b) { if (!b) {
return 0; return 0;
} }
return b->drawable;
return b->ws.drawable;
} }




if (!b) { if (!b) {
return 0; return 0;
} }
return b->drawable;
return b->ws.drawable;
} }




if (xmbuf) { if (xmbuf) {
xmbuf->largestPbuffer = useLargest; xmbuf->largestPbuffer = useLargest;
xmbuf->preservedContents = preserveContents; xmbuf->preservedContents = preserveContents;
return (GLXPbuffer) xmbuf->drawable;
return (GLXPbuffer) xmbuf->ws.drawable;
} }
else { else {
return 0; return 0;
{ {
XMesaVisual xmvis = (XMesaVisual) config; XMesaVisual xmvis = (XMesaVisual) config;
XMesaBuffer xmbuf = XMesaCreatePixmapBuffer(xmvis, pixmap, 0); 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 */
} }




/* A GLXPbuffer handle must be an X Drawable because that's what /* A GLXPbuffer handle must be an X Drawable because that's what
* glXMakeCurrent takes. * glXMakeCurrent takes.
*/ */
return (GLXPbuffer) xmbuf->drawable;
return (GLXPbuffer) xmbuf->ws.drawable;
} }





+ 1
- 1
src/gallium/state_trackers/glx/xlib/xm_api.c View File

if (!b) if (!b)
return NULL; return NULL;


b->ws.drawable = b->drawable = d;
b->ws.drawable = d;
b->ws.visual = vis->visinfo->visual; b->ws.visual = vis->visinfo->visual;
b->ws.depth = vis->visinfo->depth; b->ws.depth = vis->visinfo->depth;



+ 0
- 1
src/gallium/state_trackers/glx/xlib/xm_api.h View File



GLboolean wasCurrent; /* was ever the current buffer? */ GLboolean wasCurrent; /* was ever the current buffer? */
XMesaVisual xm_visual; /* the X/Mesa visual */ XMesaVisual xm_visual; /* the X/Mesa visual */
Drawable drawable; /* Usually the X window ID */
Colormap cmap; /* the X colormap */ Colormap cmap; /* the X colormap */
BufferType type; /* window, pixmap, pbuffer or glxwindow */ BufferType type; /* window, pixmap, pbuffer or glxwindow */



Loading…
Cancel
Save