OSDN Git Service
(root)
/
android-x86
/
external-mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
814d4ff
)
set SamplerUnit[] entry in load_texture() just to be safe
author
Brian
<brian.paul@tungstengraphics.com>
Fri, 14 Dec 2007 18:42:28 +0000
(11:42 -0700)
committer
Brian
<brian.paul@tungstengraphics.com>
Fri, 14 Dec 2007 18:42:28 +0000
(11:42 -0700)
src/mesa/main/texenvprogram.c
patch
|
blob
|
history
diff --git
a/src/mesa/main/texenvprogram.c
b/src/mesa/main/texenvprogram.c
index
1e46d8c
..
d866d10
100644
(file)
--- 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);