Merge branch 'mesa_7_5_branch'

diff --cc progs/glsl/Makefile
index 0875bdd795097ee27bb532b04c560fdf67ecc2ea,6af7a665cf1e773555a90e5d1e269b0918c1a183..8103a5cbca0f046e10b8b4716e550b572401a3fe
--- 1/progs/glsl/Makefile
--- 2/progs/glsl/Makefile
+++ b/progs/glsl/Makefile
@@@ -37,8 -32,8 +37,9 @@@ DEMO_SOURCES = 
        pointcoord.c \
        points.c \
        samplers.c \
+       samplers_array.c \
        shadow_sampler.c \
 +      shtest.c \
        skinning.c \
        texaaline.c \
        texdemo1.c \
@@@ -77,8 -84,9 +78,11 @@@ clean
        -rm -f readtex.*
  
  
 -
  ##### Extra dependencies
  
++samplers_array.o: samplers.c
++      $(APP_CC) $(CFLAGS) -DSAMPLERS_ARRAY $< -c -o $@
++
  extfuncs.h: $(TOP)/progs/util/extfuncs.h
        cp $< .
  

diff --cc src/mesa/shader/shader_api.c
Simple merge

diff --cc src/mesa/vbo/vbo_exec_draw.c
Simple merge