mesa/main: simplify implementation of _mesa_is_format_astc_2d

Reviewed-by: Alyssa Rosenzweig <alyssa@collabora.com>
Acked-by: Marek Olšák <marek.olsak@amd.com>
Acked-by: Soroush Kashani <soroush.kashani@imgtec.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18012>
This commit is contained in:
Erik Faye-Lund 2022-08-10 12:29:07 +02:00 committed by Marge Bot
parent 207798c557
commit bf6e70965d

View file

@ -640,39 +640,8 @@ _mesa_is_format_etc2(mesa_format format)
bool
_mesa_is_format_astc_2d(mesa_format format)
{
switch (format) {
case MESA_FORMAT_RGBA_ASTC_4x4:
case MESA_FORMAT_RGBA_ASTC_5x4:
case MESA_FORMAT_RGBA_ASTC_5x5:
case MESA_FORMAT_RGBA_ASTC_6x5:
case MESA_FORMAT_RGBA_ASTC_6x6:
case MESA_FORMAT_RGBA_ASTC_8x5:
case MESA_FORMAT_RGBA_ASTC_8x6:
case MESA_FORMAT_RGBA_ASTC_8x8:
case MESA_FORMAT_RGBA_ASTC_10x5:
case MESA_FORMAT_RGBA_ASTC_10x6:
case MESA_FORMAT_RGBA_ASTC_10x8:
case MESA_FORMAT_RGBA_ASTC_10x10:
case MESA_FORMAT_RGBA_ASTC_12x10:
case MESA_FORMAT_RGBA_ASTC_12x12:
case MESA_FORMAT_SRGB8_ALPHA8_ASTC_4x4:
case MESA_FORMAT_SRGB8_ALPHA8_ASTC_5x4:
case MESA_FORMAT_SRGB8_ALPHA8_ASTC_5x5:
case MESA_FORMAT_SRGB8_ALPHA8_ASTC_6x5:
case MESA_FORMAT_SRGB8_ALPHA8_ASTC_6x6:
case MESA_FORMAT_SRGB8_ALPHA8_ASTC_8x5:
case MESA_FORMAT_SRGB8_ALPHA8_ASTC_8x6:
case MESA_FORMAT_SRGB8_ALPHA8_ASTC_8x8:
case MESA_FORMAT_SRGB8_ALPHA8_ASTC_10x5:
case MESA_FORMAT_SRGB8_ALPHA8_ASTC_10x6:
case MESA_FORMAT_SRGB8_ALPHA8_ASTC_10x8:
case MESA_FORMAT_SRGB8_ALPHA8_ASTC_10x10:
case MESA_FORMAT_SRGB8_ALPHA8_ASTC_12x10:
case MESA_FORMAT_SRGB8_ALPHA8_ASTC_12x12:
return true;
default:
return false;
}
const struct mesa_format_info *info = _mesa_get_format_info(format);
return info->Layout == MESA_FORMAT_LAYOUT_ASTC && info->BlockDepth == 1;
}