From: Alan Hourihane <alanh@tungstengraphics.com>
Date: Mon, 8 Dec 2008 14:29:50 +0000 (+0000)
Subject: Merge commit 'origin/master' into gallium-0.2
X-Git-Tag: 062012170305~17580^2~496^2~212
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=33a1f495d4bb19288680b9812c6ec1235302d215;p=profile%2Fivi%2Fmesa.git

Merge commit 'origin/master' into gallium-0.2

Conflicts:

	progs/glsl/Makefile
---

33a1f495d4bb19288680b9812c6ec1235302d215
diff --cc progs/glsl/Makefile
index 9f5a2b7,ab024ce..ce82468
--- a/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/texcompress.c
index 5ad9364,3ff633a..0653407
--- a/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;