Merge commit 'origin/master' into gallium-0.2

Conflicts:

	progs/glsl/Makefile

diff --cc progs/glsl/Makefile
index 9f5a2b7df5bf236b6482787f9d85c7d984f63719,7c3e750882fdd0b6f92daf13f3f0292a9106a5cc..5419dfc7f46b4a9d9ecde747de6dc713bf12f2ae
--- 1/progs/glsl/Makefile
--- 2/progs/glsl/Makefile
+++ b/progs/glsl/Makefile
@@@ -103,37 -101,31 +103,44 @@@ convolutions: convolutions.o readtex.
  
  
  deriv.o: deriv.c extfuncs.h shaderutil.h
 -      $(CC) -c -I$(INCDIR) $(CFLAGS) deriv.c
 +      $(APP_CC) -c -I$(INCDIR) $(CFLAGS) deriv.c
  
  deriv: deriv.o shaderutil.o
 -      $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) deriv.o shaderutil.o $(LIBS) -o $@
 +      $(APP_CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) deriv.o shaderutil.o $(LIBS) -o $@
 +
 +
 +identity.o: identity.c extfuncs.h shaderutil.h
 +      $(APP_CC) -c -I$(INCDIR) $(CFLAGS) identity.c
 +
 +identity: identity.o shaderutil.o
 +      $(APP_CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) identity.o shaderutil.o $(LIBS) -o $@
 +
 +
 +fragcoord.o: fragcoord.c extfuncs.h shaderutil.h
 +      $(CC) -c -I$(INCDIR) $(CFLAGS) fragcoord.c
 +
 +fragcoord: fragcoord.o shaderutil.o
 +      $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) fragcoord.o shaderutil.o $(LIBS) -o $@
  
  
+ fragcoord.o: fragcoord.c extfuncs.h shaderutil.h
+       $(CC) -c -I$(INCDIR) $(CFLAGS) fragcoord.c
+ 
+ fragcoord: fragcoord.o shaderutil.o
+       $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) fragcoord.o shaderutil.o $(LIBS) -o $@
+ 
+ 
  mandelbrot.o: mandelbrot.c extfuncs.h shaderutil.h
 -      $(CC) -c -I$(INCDIR) $(CFLAGS) mandelbrot.c
 +      $(APP_CC) -c -I$(INCDIR) $(CFLAGS) mandelbrot.c
  
  mandelbrot: mandelbrot.o shaderutil.o
 -      $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) mandelbrot.o shaderutil.o $(LIBS) -o $@
 -
 +      $(APP_CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) mandelbrot.o shaderutil.o $(LIBS) -o $@
  
  multitex.o: multitex.c extfuncs.h readtex.h shaderutil.h
 -      $(CC) -c -I$(INCDIR) $(CFLAGS) multitex.c
 +      $(APP_CC) -c -I$(INCDIR) $(CFLAGS) multitex.c
  
  multitex: multitex.o readtex.o shaderutil.o
 -      $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) multitex.o readtex.o shaderutil.o $(LIBS) -o $@
 +      $(APP_CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) multitex.o readtex.o shaderutil.o $(LIBS) -o $@
  
  
  noise.o: noise.c extfuncs.h shaderutil.h

diff --cc src/mesa/main/config.h
Simple merge

diff --cc src/mesa/main/mtypes.h
Simple merge

diff --cc src/mesa/shader/slang/slang_link.c
Simple merge