diff --git a/src/mesa/main/formats.c b/src/mesa/main/formats.c
index cdd262f509c..137d0111dd4 100644
--- a/src/mesa/main/formats.c
+++ b/src/mesa/main/formats.c
@@ -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;
 }