From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Fri, 12 Dec 2003 20:19:13 +0000 (+0000)
Subject: check swrast->NewState in Draw/CopyPixels functions
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=74466be8cb53109c519bb00e5b18df11802d05a7;p=mesa.git

check swrast->NewState in Draw/CopyPixels functions
---

diff --git a/src/mesa/drivers/x11/xm_dd.c b/src/mesa/drivers/x11/xm_dd.c
index d1d00983029..8dd7f9f90a2 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 */