Merge commit 'origin/master' into gallium-0.2

diff --cc progs/tests/Makefile
index 94473fc,86b0cb5..b96ad9f
--- 1/progs/tests/Makefile
--- 2/progs/tests/Makefile
+++ b/progs/tests/Makefile
@@@ -132,60 -124,52 +132,67 @@@ getproclist.h: $(TOP)/src/mesa/glapi/gl
        python getprocaddress.py > getproclist.h
  
  arraytexture: arraytexture.o readtex.o
 -      $(CC) $(CFLAGS) arraytexture.o readtex.o $(LIBS) -o $@
 +      $(APP_CC) $(CFLAGS) arraytexture.o readtex.o $(LIBS) -o $@
  
  arraytexture.o: arraytexture.c readtex.h
 -      $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) arraytexture.c -o $@
 +      $(APP_CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) arraytexture.c -o $@
  
  afsmultiarb: afsmultiarb.o readtex.o
 -      $(CC) $(CFLAGS) $(LDFLAGS) afsmultiarb.o readtex.o $(LIBS) -o $@
 +      $(APP_CC) $(CFLAGS) $(LDFLAGS) afsmultiarb.o readtex.o $(LIBS) -o $@
  
  afsmultiarb.o: afsmultiarb.c readtex.h
 -      $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) afsmultiarb.c -o $@
 +      $(APP_CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) afsmultiarb.c -o $@
  
  drawbuffers: drawbuffers.o
 -      $(CC) $(CFLAGS) $(LDFLAGS) drawbuffers.o $(LIBS) -o $@
 +      $(APP_CC) $(CFLAGS) $(LDFLAGS) drawbuffers.o $(LIBS) -o $@
  
  drawbuffers.o: drawbuffers.c extfuncs.h
 -      $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) drawbuffers.c -o $@
 +      $(APP_CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) drawbuffers.c -o $@
  
  texrect: texrect.o readtex.o
 -      $(CC) $(CFLAGS) $(LDFLAGS) texrect.o readtex.o $(LIBS) -o $@
 +      $(APP_CC) $(CFLAGS) $(LDFLAGS) texrect.o readtex.o $(LIBS) -o $@
  
  texrect.o: texrect.c readtex.h
 -      $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) texrect.c -o $@
 +      $(APP_CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) texrect.c -o $@
  
  bug_3195: bug_3195.o readtex.o
 -      $(CC) $(CFLAGS) $(LDFLAGS) bug_3195.o readtex.o $(LIBS) -o $@
 +      $(APP_CC) $(CFLAGS) $(LDFLAGS) bug_3195.o readtex.o $(LIBS) -o $@
  
  bug_3195.o: bug_3195.c readtex.h
 -      $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) bug_3195.c -o $@
 +      $(APP_CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) bug_3195.c -o $@
  
  invert: invert.o readtex.o
 -      $(CC) $(CFLAGS) $(LDFLAGS) invert.o readtex.o $(LIBS) -o $@
 +      $(APP_CC) $(CFLAGS) $(LDFLAGS) invert.o readtex.o $(LIBS) -o $@
  
  invert.o: invert.c readtex.h
 -      $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) invert.c -o $@
 +      $(APP_CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) invert.c -o $@
 +
 +mipmap_view: mipmap_view.o readtex.o
 +      $(APP_CC) $(CFLAGS) mipmap_view.o readtex.o $(LIBS) -o $@
 +
 +mipmap_view.o: mipmap_view.c readtex.h
 +      $(APP_CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
 +
 +
 +fillrate: fillrate.o readtex.o
 +      $(APP_CC) $(CFLAGS) fillrate.o readtex.o $(LIBS) -o $@
 +
 +fillrate.o: fillrate.c readtex.h
 +      $(APP_CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
 +
 +
  
+ 
+ floattex: floattex.o readtex.o shaderutil.o
+       $(CC) $(CFLAGS) $(LDFLAGS) floattex.o readtex.o shaderutil.o $(LIBS) -o $@
+ 
+ floattex.o: floattex.c readtex.h shaderutil.h
+       $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) floattex.c -o $@
+ 
+ 
  readtex.o: readtex.c
 -      $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) readtex.c -o $@
 +      $(APP_CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) readtex.c -o $@
  
- 
  readtex.h: $(TOP)/progs/util/readtex.h
        ln -s $(TOP)/progs/util/readtex.h .
  

diff --cc src/glut/glx/Makefile
Simple merge

diff --cc src/glut/glx/glutint.h
Simple merge

diff --cc src/mesa/main/sources
Simple merge

diff --cc src/mesa/main/texcompress_s3tc.c
Simple merge

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

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

diff --cc src/mesa/sources
Simple merge