summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2003-12-12 20:19:13 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2003-12-12 20:19:13 +0000
commit74466be8cb53109c519bb00e5b18df11802d05a7 (patch)
tree483d8ce077dbe7b7eb61aa445235c0d79a8c7c62 /src
parent4a3110fb213f419a47822eb44c5f2fcd74bb3b0d (diff)
check swrast->NewState in Draw/CopyPixels functions
Diffstat (limited to 'src')
-rw-r--r--src/mesa/drivers/x11/xm_dd.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/mesa/drivers/x11/xm_dd.c b/src/mesa/drivers/x11/xm_dd.c
index d1d0098302..8dd7f9f90a 100644
--- a/src/mesa/drivers/x11/xm_dd.c
+++ b/src/mesa/drivers/x11/xm_dd.c
@@ -790,6 +790,9 @@ xmesa_DrawPixels_8R8G8B( GLcontext *ctx,
ASSERT(xmesa->xm_visual->dithered_pf == PF_8R8G8B);
ASSERT(xmesa->xm_visual->undithered_pf == PF_8R8G8B);
+ if (swrast->NewState)
+ _swrast_validate_derived( ctx );
+
if (buffer && /* buffer != 0 means it's a Window or Pixmap */
format == GL_BGRA &&
type == GL_UNSIGNED_BYTE &&
@@ -861,6 +864,9 @@ xmesa_DrawPixels_5R6G5B( GLcontext *ctx,
ASSERT(gc);
ASSERT(xmesa->xm_visual->undithered_pf == PF_5R6G5B);
+ if (swrast->NewState)
+ _swrast_validate_derived( ctx );
+
if (buffer && /* buffer != 0 means it's a Window or Pixmap */
format == GL_RGB &&
type == GL_UNSIGNED_SHORT_5_6_5 &&
@@ -930,6 +936,9 @@ xmesa_CopyPixels( GLcontext *ctx,
ASSERT(dpy);
ASSERT(gc);
+ if (swrast->NewState)
+ _swrast_validate_derived( ctx );
+
if (ctx->Color.DrawBuffer == GL_FRONT &&
ctx->Pixel.ReadBuffer == GL_FRONT &&
drawBuffer && /* buffer != 0 means it's a Window or Pixmap */