llvmpipe,softpipe: only support ETC1, not the upcoming ETC2

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>

diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c b/src/gallium/drivers/llvmpipe/lp_screen.c
index 8b6e66e968cfec15d6f26c3e3939fa4523168ef2..3387d3a047fd0296362d1b5297e688b689cbbf15 100644 (file)
--- 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 bae136768a4abd01c1276be2483755068c204021..a269328aff8704e5c21aa8276ca7131bd369ec49 100644 (file)
--- 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).
     */