Merge commit 'origin/master' into gallium-0.2

Conflicts:

	progs/glsl/Makefile

diff --cc progs/glsl/Makefile
index 9f5a2b7df5bf236b6482787f9d85c7d984f63719,ab024cecadf619240a5050f57dda174b5a9e4d7c..ce82468168d40b6c5e67f503823c03bb80760c1c
--- 1/progs/glsl/Makefile
--- 2/progs/glsl/Makefile
+++ b/progs/glsl/Makefile
@@@ -186,10 -179,18 +186,22 @@@ twoside: twoside.o shaderutil.
  
  
  trirast.o: trirast.c extfuncs.h shaderutil.h
 -      $(CC) -c -I$(INCDIR) $(CFLAGS) trirast.c
 +      $(APP_CC) -c -I$(INCDIR) $(CFLAGS) trirast.c
  
  trirast: trirast.o shaderutil.o
++<<<<<<< HEAD:progs/glsl/Makefile
 +      $(APP_CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) trirast.o shaderutil.o $(LIBS) -o $@
++=======
+       $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) trirast.o shaderutil.o $(LIBS) -o $@
+ 
+ 
+ vert-tex.o: vert-tex.c extfuncs.h shaderutil.h
+       $(CC) -c -I$(INCDIR) $(CFLAGS) vert-tex.c
+ 
+ vert-tex: vert-tex.o shaderutil.o
+       $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) vert-tex.o shaderutil.o $(LIBS) -o $@
+ 
++>>>>>>> origin/master:progs/glsl/Makefile
  
  
  

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

diff --cc src/mesa/main/texcompress.c
index 5ad936419b639f3f5cf4cca4f3ddecd84222e608,3ff633acd2bd1d0a03c2c1eb2d49c2e83ee97ff9..0653407048cd7a6b012b3fbedde46b361f7f6f2a
--- 1/src/mesa/main/texcompress.c
--- 2/src/mesa/main/texcompress.c
+++ b/src/mesa/main/texcompress.c
@@@ -151,11 -149,7 +151,9 @@@ _mesa_compressed_texture_size( GLcontex
        /* Textures smaller than 8x4 will effectively be made into 8x4 and
         * take 16 bytes.
         */
-       if (size < 16)
-          size = 16;
        return size;
 +#endif
 +#if FEATURE_texture_s3tc
     case MESA_FORMAT_RGB_DXT1:
     case MESA_FORMAT_RGBA_DXT1:
        /* round up width, height to next multiple of 4 */
@@@ -179,10 -171,7 +175,8 @@@
        /* Textures smaller than 4x4 will effectively be made into 4x4 and
         * take 16 bytes.
         */
-       if (size < 16)
-          size = 16;
        return size;
 +#endif
     default:
        _mesa_problem(ctx, "bad mesaFormat in _mesa_compressed_texture_size");
        return 0;

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