From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Wed, 13 Aug 2008 16:28:38 +0000 (-0600)
Subject: mesa: fix a swrast state validation bug
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=505606349e5154c67d1a857d7125048669a594c3;p=mesa.git

mesa: fix a swrast state validation bug

Fixes progs/glsl/points.c
---

diff --git a/src/mesa/swrast/s_context.c b/src/mesa/swrast/s_context.c
index eab9ff3a9e7..b64156a82d3 100644
--- a/src/mesa/swrast/s_context.c
+++ b/src/mesa/swrast/s_context.c
@@ -2,7 +2,7 @@
  * Mesa 3-D graphics library
  * Version:  7.1
  *
- * Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -33,6 +33,7 @@
 #include "mtypes.h"
 #include "teximage.h"
 #include "swrast.h"
+#include "shader/prog_parameter.h"
 #include "shader/prog_statevars.h"
 #include "s_blend.h"
 #include "s_context.h"
@@ -501,6 +502,13 @@ _swrast_invalidate_state( GLcontext *ctx, GLbitfield new_state )
       new_state = ~0;
    }
 
+   {
+      const struct gl_fragment_program *fp = ctx->FragmentProgram._Current;
+      if (fp && (fp->Base.Parameters->StateFlags & new_state)) {
+         _mesa_load_state_parameters(ctx, fp->Base.Parameters);
+      }
+   }
+
    if (new_state & swrast->InvalidateTriangleMask)
       swrast->Triangle = _swrast_validate_triangle;