From: Brian Paul <brianp@vmware.com>
Date: Wed, 26 Aug 2009 18:01:23 +0000 (-0600)
Subject: Merge branch 'mesa_7_5_branch'
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=476290946e7bd3b7fe5688622127d8c6a9c7f367;p=mesa.git

Merge branch 'mesa_7_5_branch'
---

476290946e7bd3b7fe5688622127d8c6a9c7f367
diff --cc progs/glsl/Makefile
index 0875bdd7950,6af7a665cf1..8103a5cbca0
--- a/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 $< .