summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian <[email protected]>2007-03-14 12:42:30 -0600
committerBrian <[email protected]>2007-03-14 12:42:30 -0600
commit47e0b606a85059ff29fe311dc2f1bcafdefe4cdb (patch)
tree00c887488dca954b0f84f2192b80b65ba2b4d99e
parent17fb7821d7cdc0ed211eaef013ee7798619a61d3 (diff)
move CLIENT_ID code in xmesa_delete_framebuffer(), see bug 7205
-rw-r--r--src/mesa/drivers/x11/xm_buffer.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/mesa/drivers/x11/xm_buffer.c b/src/mesa/drivers/x11/xm_buffer.c
index 747971a6c30..73c46b1fe60 100644
--- a/src/mesa/drivers/x11/xm_buffer.c
+++ b/src/mesa/drivers/x11/xm_buffer.c
@@ -362,16 +362,13 @@ xmesa_delete_framebuffer(struct gl_framebuffer *fb)
{
XMesaBuffer b = XMESA_BUFFER(fb);
-#ifdef XFree86Server
- int client = 0;
- if (b->frontxrb->drawable)
- client = CLIENT_ID(b->frontxrb->drawable->id);
-#endif
-
if (b->num_alloced > 0) {
/* If no other buffer uses this X colormap then free the colors. */
if (!xmesa_find_buffer(b->display, b->cmap, b)) {
#ifdef XFree86Server
+ int client = 0;
+ if (b->frontxrb->drawable)
+ client = CLIENT_ID(b->frontxrb->drawable->id);
(void)FreeColors(b->cmap, client,
b->num_alloced, b->alloced_colors, 0);
#else