llvmpipe, softpipe: no support for ATC textures

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: Jonathan Marek <jonathan@marek.ca>
Reviewed-by: Roland Scheidegger <sroland@vmware.com>

diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c b/src/gallium/drivers/llvmpipe/lp_screen.c
index b55b4a3c4feb010c83f8e1449e0c1cb83cfcd790..8426427e397b669cbc106c8ee50a767cc10bcc49 100644 (file)
--- a/src/gallium/drivers/llvmpipe/lp_screen.c
+++ b/src/gallium/drivers/llvmpipe/lp_screen.c
@@ -549,7 +549,8 @@ llvmpipe_is_format_supported( struct pipe_screen *_screen,
       }
    }
 
-   if (format_desc->layout == UTIL_FORMAT_LAYOUT_ASTC) {
+   if (format_desc->layout == UTIL_FORMAT_LAYOUT_ASTC ||
+       format_desc->layout == UTIL_FORMAT_LAYOUT_ATC) {
       /* Software decoding is not hooked up. */
       return FALSE;
    }

diff --git a/src/gallium/drivers/llvmpipe/lp_test_format.c b/src/gallium/drivers/llvmpipe/lp_test_format.c
index 885d886cfa99e75bf56c3f8b84d023c9c35282f0..d9ba5ef6c0f7e0d71a86351743c3913b66754c83 100644 (file)
--- a/src/gallium/drivers/llvmpipe/lp_test_format.c
+++ b/src/gallium/drivers/llvmpipe/lp_test_format.c
@@ -382,7 +382,7 @@ test_all(unsigned verbose, FILE *fp)
          }
 
          if (util_format_is_pure_integer(format))
-           continue;
+            continue;
 
          /* only have util fetch func for etc1 */
          if (format_desc->layout == UTIL_FORMAT_LAYOUT_ETC &&
@@ -391,7 +391,8 @@ test_all(unsigned verbose, FILE *fp)
          }
 
          /* missing fetch funcs */
-         if (format_desc->layout == UTIL_FORMAT_LAYOUT_ASTC) {
+         if (format_desc->layout == UTIL_FORMAT_LAYOUT_ASTC ||
+             format_desc->layout == UTIL_FORMAT_LAYOUT_ATC) {
             continue;
          }
 
@@ -401,7 +402,7 @@ test_all(unsigned verbose, FILE *fp)
          }
 
          if (!test_one(verbose, fp, format_desc, use_cache)) {
-              success = FALSE;
+            success = FALSE;
          }
       }
    }

diff --git a/src/gallium/drivers/softpipe/sp_screen.c b/src/gallium/drivers/softpipe/sp_screen.c
index ffe85337bff27e4b9fd5ac9534f2740f81cf9f29..0a4235152da3f5fbb5eede087fe16a705bf5ae79 100644 (file)
--- a/src/gallium/drivers/softpipe/sp_screen.c
+++ b/src/gallium/drivers/softpipe/sp_screen.c
@@ -460,7 +460,8 @@ softpipe_is_format_supported( struct pipe_screen *screen,
          return FALSE;
    }
 
-   if (format_desc->layout == UTIL_FORMAT_LAYOUT_ASTC) {
+   if (format_desc->layout == UTIL_FORMAT_LAYOUT_ASTC ||
+       format_desc->layout == UTIL_FORMAT_LAYOUT_ATC) {
       /* Software decoding is not hooked up. */
       return FALSE;
    }