OSDN Git Service

set SamplerUnit[] entry in load_texture() just to be safe
authorBrian <brian.paul@tungstengraphics.com>
Fri, 14 Dec 2007 18:42:28 +0000 (11:42 -0700)
committerBrian <brian.paul@tungstengraphics.com>
Fri, 14 Dec 2007 18:42:28 +0000 (11:42 -0700)
src/mesa/main/texenvprogram.c

index 1e46d8c..d866d10 100644 (file)
@@ -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);