Merge remote branch 'origin/master' into pipe-video

2011-02-28 23:59:53 +01:00
parent 77217af40d 5f44fab5a6
commit b97e41c7b1
78 changed files with 2355 additions and 384 deletions
--- a/src/gallium/drivers/softpipe/sp_screen.c
+++ b/src/gallium/drivers/softpipe/sp_screen.c
@@ -249,6 +249,11 @@ softpipe_is_format_supported( struct pipe_screen *screen,
      return util_format_s3tc_enabled;
   }

+   /* u_format doesn't implement RGTC yet */
+   if (format_desc->layout == UTIL_FORMAT_LAYOUT_RGTC) {
+	return FALSE;
+   }
+
   /*
    * Everything else should be supported by u_format.
    */