diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2003-12-04 03:19:46 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2003-12-04 03:19:46 +0000 |
| commit | b305028464f02947c0cce0476af0e35f4ed1fafa (patch) | |
| tree | 6623fb86dea2eb572743c161055e37a1d43c995d /src/mesa/drivers/x11/xm_dd.c | |
| parent | 03e29a5f77c13b7b888bd8443cb2752850e47d6a (diff) | |
Port over changes from XFree86/Mesa 5.0.2, mostly to silence compiler warnings.
Diffstat (limited to 'src/mesa/drivers/x11/xm_dd.c')
| -rw-r--r-- | src/mesa/drivers/x11/xm_dd.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mesa/drivers/x11/xm_dd.c b/src/mesa/drivers/x11/xm_dd.c index d82edda774..7d896c5d58 100644 --- a/src/mesa/drivers/x11/xm_dd.c +++ b/src/mesa/drivers/x11/xm_dd.c @@ -137,8 +137,8 @@ set_buffer( GLcontext *ctx, GLframebuffer *buffer, GLuint bufferBit ) else if (bufferBit == BACK_LEFT_BIT) { ASSERT(target->db_state); if (target->backpixmap) { - /* back buffer is a pixmape */ - target->buffer = target->backpixmap; /* incompatible types? */ + /* back buffer is a pixmap */ + target->buffer = (XMesaDrawable) target->backpixmap; } else if (target->backimage) { /* back buffer is an XImage */ @@ -413,6 +413,7 @@ clear_24bit_ximage( GLcontext *ctx, GLboolean all, const GLubyte r = xmesa->clearcolor[0]; const GLubyte g = xmesa->clearcolor[1]; const GLubyte b = xmesa->clearcolor[2]; +#if 0 /* See below */ register GLuint clearPixel; if (xmesa->swapbytes) { clearPixel = (b << 16) | (g << 8) | r; @@ -420,6 +421,7 @@ clear_24bit_ximage( GLcontext *ctx, GLboolean all, else { clearPixel = (r << 16) | (g << 8) | b; } +#endif if (all) { if (r==g && g==b) { |