summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian <brian.paul@tungstengraphics.com>2007-12-14 11:42:28 -0700
committerKeith Whitwell <keith@tungstengraphics.com>2008-09-24 10:15:07 -0700
commit1fe385fdc96688a5249d52184f457910a0c25488 (patch)
tree30452a59d144d9171d6198375857e10f2adab791
parentdff0b0e772185c359a1ad50afc7d5680745b1b1b (diff)
set SamplerUnit[] entry in load_texture() just to be safe
(cherry picked from commit fce4612f8a29ee1798c9326a431a139d856c7a04)
-rw-r--r--src/mesa/main/texenvprogram.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index bcf91022244..dcd7f905679 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -957,6 +957,10 @@ static void load_texture( struct texenv_fragment_program *p, GLuint unit )
p->program->Base.ShadowSamplers |= 1 << unit;
p->program->Base.SamplersUsed |= (1 << unit);
+ /* This identity mapping should already be in place
+ * (see _mesa_init_program_struct()) but let's be safe.
+ */
+ p->program->Base.SamplerUnits[unit] = unit;
}
else
p->src_texture[unit] = get_zero(p);