From: Brian Paul <brianp@vmware.com>
Date: Sat, 10 Dec 2011 18:44:43 +0000 (-0700)
Subject: swrast: add missing state validation calls for Blit, Clear
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=22e806f57013b2c116b5bfab228e0f28e25198f4;p=mesa.git

swrast: add missing state validation calls for Blit, Clear
---

diff --git a/src/mesa/swrast/s_blit.c b/src/mesa/swrast/s_blit.c
index f094be8985c..2817ec12ff9 100644
--- a/src/mesa/swrast/s_blit.c
+++ b/src/mesa/swrast/s_blit.c
@@ -573,6 +573,9 @@ _swrast_BlitFramebuffer(struct gl_context *ctx,
       return;
    }
 
+   if (SWRAST_CONTEXT(ctx)->NewState)
+      _swrast_validate_derived(ctx);
+
    swrast_render_start(ctx);
 
    if (srcX1 - srcX0 == dstX1 - dstX0 &&
diff --git a/src/mesa/swrast/s_clear.c b/src/mesa/swrast/s_clear.c
index 615747d6984..851f6d16567 100644
--- a/src/mesa/swrast/s_clear.c
+++ b/src/mesa/swrast/s_clear.c
@@ -213,6 +213,9 @@ _swrast_Clear(struct gl_context *ctx, GLbitfield buffers)
    if (!_mesa_check_conditional_render(ctx))
       return; /* don't clear */
 
+   if (SWRAST_CONTEXT(ctx)->NewState)
+      _swrast_validate_derived(ctx);
+
    swrast_render_start(ctx);
 
    /* do software clearing here */