summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Marek <[email protected]>2019-02-05 11:00:14 -0500
committerRob Clark <[email protected]>2019-04-23 17:11:56 +0000
commitbfa72e4d52329df22d981a3ad96f2a13d7991c4a (patch)
treed29af5a89ee314e81665de8bc60da74948713c42
parentea254fcd3c1050d691b43f0e2c5570e32d0783dd (diff)
llvmpipe, softpipe: no support for ATC textures
Signed-off-by: Ilia Mirkin <[email protected]> Signed-off-by: Jonathan Marek <[email protected]> Reviewed-by: Roland Scheidegger <[email protected]>
-rw-r--r--src/gallium/drivers/llvmpipe/lp_screen.c3
-rw-r--r--src/gallium/drivers/llvmpipe/lp_test_format.c7
-rw-r--r--src/gallium/drivers/softpipe/sp_screen.c3
3 files changed, 8 insertions, 5 deletions
diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c b/src/gallium/drivers/llvmpipe/lp_screen.c
index b55b4a3c4fe..8426427e397 100644
--- 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 885d886cfa9..d9ba5ef6c0f 100644
--- 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 ffe85337bff..0a4235152da 100644
--- 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;
}