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)
committerKeith Whitwell <keith@tungstengraphics.com>
Wed, 24 Sep 2008 17:15:07 +0000 (10:15 -0700)
(cherry picked from commit fce4612f8a29ee1798c9326a431a139d856c7a04)

src/mesa/main/texenvprogram.c

index bcf9102..dcd7f90 100644 (file)
@@ -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);