summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2009-05-05 12:14:29 -0700
committerEric Anholt <eric@anholt.net>2009-05-05 12:14:29 -0700
commitc521d4629b2112128f2b3864bb8acf2ca84f1d5f (patch)
treea9c7ae9ac69d8aefd658aa2a7f953ca14e35066a
parente9d5569bf3e5d7a78a790c144aed275f1a32f325 (diff)
Flag GLSL programs as depending on constant state when they use uniforms.
This is not a cherry-pick, as it got fixed in master with the _NEW_PROGRAM_CONSTANTS change. Fixes bad rendering with various GLSL programs idr and I have been writing.
-rw-r--r--src/mesa/shader/slang/slang_link.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/mesa/shader/slang/slang_link.c b/src/mesa/shader/slang/slang_link.c
index b8427cae58f..2aa38519113 100644
--- a/src/mesa/shader/slang/slang_link.c
+++ b/src/mesa/shader/slang/slang_link.c
@@ -249,6 +249,11 @@ link_uniform_vars(GLcontext *ctx,
_mesa_append_uniform(shProg->Uniforms, p->Name, prog->Target, i);
if (uniform)
uniform->Initialized = p->Initialized;
+
+ /* Add the flag indicating that the program is dependent on constant
+ * state.
+ */
+ prog->Parameters->StateFlags |= _NEW_PROGRAM;
}
/* The samplerMap[] table we build here is used to remap/re-index