From 845b9e4294b7b89a33d77ef6713543f96eba0686 Mon Sep 17 00:00:00 2001 From: Ilia Mirkin Date: Wed, 18 Feb 2015 22:23:12 -0500 Subject: [PATCH] llvmpipe,softpipe: only support ETC1, not the upcoming ETC2 Signed-off-by: Ilia Mirkin --- src/gallium/drivers/llvmpipe/lp_screen.c | 4 ++++ src/gallium/drivers/softpipe/sp_screen.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c b/src/gallium/drivers/llvmpipe/lp_screen.c index 8b6e66e968c..3387d3a047f 100644 --- a/src/gallium/drivers/llvmpipe/lp_screen.c +++ b/src/gallium/drivers/llvmpipe/lp_screen.c @@ -453,6 +453,10 @@ llvmpipe_is_format_supported( struct pipe_screen *_screen, return FALSE; } + if (format_desc->layout == UTIL_FORMAT_LAYOUT_ETC && + format != PIPE_FORMAT_ETC1_RGB8) + return FALSE; + if (format_desc->layout == UTIL_FORMAT_LAYOUT_S3TC) { return util_format_s3tc_enabled; } diff --git a/src/gallium/drivers/softpipe/sp_screen.c b/src/gallium/drivers/softpipe/sp_screen.c index bae136768a4..a269328aff8 100644 --- a/src/gallium/drivers/softpipe/sp_screen.c +++ b/src/gallium/drivers/softpipe/sp_screen.c @@ -353,6 +353,10 @@ softpipe_is_format_supported( struct pipe_screen *screen, return FALSE; } + if (format_desc->layout == UTIL_FORMAT_LAYOUT_ETC && + format != PIPE_FORMAT_ETC1_RGB8) + return FALSE; + /* * All other operations (sampling, transfer, etc). */ -- 2.30.2