aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa/main
diff options
context:
space:
mode:
authorBrian <[email protected]>2007-12-14 11:42:28 -0700
committerBrian <[email protected]>2007-12-14 11:42:28 -0700
commitfce4612f8a29ee1798c9326a431a139d856c7a04 (patch)
treed5b2b757c7405ee098b379069c38c2f6dcf69584 /src/mesa/main
parent814d4ff83a515fe161cfb86c8b1492e2218051fe (diff)
set SamplerUnit[] entry in load_texture() just to be safe
Diffstat (limited to 'src/mesa/main')
-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 1e46d8c3754..d866d10017e 100644
--- a/src/mesa/main/texenvprogram.c
+++ b/src/mesa/main/texenvprogram.c
@@ -941,6 +941,10 @@ static void load_texture( struct texenv_fragment_program *p, GLuint unit )
tmp, WRITEMASK_XYZW,
unit, dim, texcoord );
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);