set SamplerUnit[] entry in load_texture() just to be safe

(cherry picked from commit fce4612f8a29ee1798c9326a431a139d856c7a04)

diff --git a/src/mesa/main/texenvprogram.c b/src/mesa/main/texenvprogram.c
index bcf910222448c3606ef00fbe68d77adfb4877a65..dcd7f9056794928a343cf48a04eca0d5d9881193 100644 (file)
--- 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);