31 lines
1.0 KiB
Diff
31 lines
1.0 KiB
Diff
|
commit 47e0b606a85059ff29fe311dc2f1bcafdefe4cdb
|
||
|
|
Author: Brian <brian@yutani.localnet.net>
|
||
|
|
Date: Wed Mar 14 12:42:30 2007 -0600
|
||
|
|
|
||
|
|
move CLIENT_ID code in xmesa_delete_framebuffer(), see bug 7205
|
||
|
|
|
||
|
|
diff --git a/src/mesa/drivers/x11/xm_buffer.c b/src/mesa/drivers/x11/xm_buffer.c
|
||
|
|
index 747971a..73c46b1 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_frame
|
||
|
|
{
|
||
|
|
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
|