[Mesa-dev] [PATCH 2/2] softpipe/llvmpipe: don't advertize support for ASTC

[Ilia Mirkin]

Series is

Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>

Sorry for the breakage!

On Tue, Nov 24, 2015 at 11:56 AM,  <sroland at vmware.com> wrote:
> From: Roland Scheidegger <sroland at vmware.com>
>
> 33339775565154040e0c4ea2e196217dccc08cdf added support for ASTC textures to
> gallium. They don't have any helpers hooked up for software decoding, however,
> so cannot support them in drivers relying on util code for decoding.
> ---
>  src/gallium/drivers/llvmpipe/lp_screen.c | 3 ++-
>  src/gallium/drivers/softpipe/sp_screen.c | 3 ++-
>  2 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c b/src/gallium/drivers/llvmpipe/lp_screen.c
> index 9f5e737..899f28d 100644
> --- a/src/gallium/drivers/llvmpipe/lp_screen.c
> +++ b/src/gallium/drivers/llvmpipe/lp_screen.c
> @@ -460,7 +460,8 @@ llvmpipe_is_format_supported( struct pipe_screen *_screen,
>        }
>     }
>
> -   if (format_desc->layout == UTIL_FORMAT_LAYOUT_BPTC) {
> +   if (format_desc->layout == UTIL_FORMAT_LAYOUT_BPTC ||
> +       format_desc->layout == UTIL_FORMAT_LAYOUT_ASTC) {
>        /* Software decoding is not hooked up. */
>        return FALSE;
>     }
> diff --git a/src/gallium/drivers/softpipe/sp_screen.c b/src/gallium/drivers/softpipe/sp_screen.c
> index bb4cef2..2ae72b2 100644
> --- a/src/gallium/drivers/softpipe/sp_screen.c
> +++ b/src/gallium/drivers/softpipe/sp_screen.c
> @@ -362,7 +362,8 @@ softpipe_is_format_supported( struct pipe_screen *screen,
>           return FALSE;
>     }
>
> -   if (format_desc->layout == UTIL_FORMAT_LAYOUT_BPTC) {
> +   if (format_desc->layout == UTIL_FORMAT_LAYOUT_BPTC ||
> +       format_desc->layout == UTIL_FORMAT_LAYOUT_ASTC) {
>        /* Software decoding is not hooked up. */
>        return FALSE;
>     }
> --
> 2.1.4
>