summaryrefslogtreecommitdiff
path: root/src/mesa/drivers
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2003-12-05 00:44:01 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2003-12-05 00:44:01 +0000
commita6ad01c14e8b7d819783d81c1febfa8e72063bf3 (patch)
tree375c1252106162279adb97aee86149b5ab21cc69 /src/mesa/drivers
parent15f7f4e31f1a90d58a4e897299039c9fd39782f9 (diff)
Fix a front/back CopyPixels glitch.
Diffstat (limited to 'src/mesa/drivers')
-rw-r--r--src/mesa/drivers/x11/xm_dd.c6
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 58b0db1ed1..d1d0098302 100644
--- a/src/mesa/drivers/x11/xm_dd.c
+++ b/src/mesa/drivers/x11/xm_dd.c
@@ -930,7 +930,9 @@ xmesa_CopyPixels( GLcontext *ctx,
ASSERT(dpy);
ASSERT(gc);
- if (drawBuffer && /* buffer != 0 means it's a Window or Pixmap */
+ if (ctx->Color.DrawBuffer == GL_FRONT &&
+ ctx->Pixel.ReadBuffer == GL_FRONT &&
+ drawBuffer && /* buffer != 0 means it's a Window or Pixmap */
readBuffer &&
type == GL_COLOR &&
(swrast->_RasterMask & ~CLIP_BIT) == 0 && /* no blend, z-test, etc */
@@ -1120,7 +1122,7 @@ void xmesa_init_pointers( GLcontext *ctx )
ctx->Driver.DrawPixels = _swrast_DrawPixels;
ctx->Driver.CopyPixels = _swrast_CopyPixels;
#else
- ctx->Driver.CopyPixels = xmesa_CopyPixels;
+ ctx->Driver.CopyPixels = /*_swrast_CopyPixels;*/xmesa_CopyPixels;
if (xmesa->xm_visual->undithered_pf == PF_8R8G8B &&
xmesa->xm_visual->dithered_pf == PF_8R8G8B) {
ctx->Driver.DrawPixels = xmesa_DrawPixels_8R8G8B;