Mesa (master): set SamplerUnit[] entry in load_texture() just to be safe
Keith Whitwell
keithw at kemper.freedesktop.org
Wed Sep 24 17:37:27 UTC 2008
Module: Mesa
Branch: master
Commit: 1fe385fdc96688a5249d52184f457910a0c25488
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1fe385fdc96688a5249d52184f457910a0c25488
Author: Brian <brian.paul at tungstengraphics.com>
Date: Fri Dec 14 11:42:28 2007 -0700
set SamplerUnit[] entry in load_texture() just to be safe
(cherry picked from commit fce4612f8a29ee1798c9326a431a139d856c7a04)
---
src/mesa/main/texenvprogram.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index bcf9102..dcd7f90 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);
More information about the mesa-commit
mailing list