Mesa (main): intel/isl: Stop claiming ASTC works on Cherry View

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 8afc9626ad1d9f8852d84d6e86abee991b37d3fa
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8afc9626ad1d9f8852d84d6e86abee991b37d3fa

Author: Jason Ekstrand <jason at jlekstrand.net>
Date:   Tue Oct  5 16:12:41 2021 -0500

intel/isl: Stop claiming ASTC works on Cherry View

We do, however, leave a nice tombstone comment in case anyone comes
looking.  Given the age and scarcity of Cherry View hardware and ASTC
apps that run on desktop Linux, it's unlikely we'll ever bother to
implement it.

Reviewed-by: Nanley Chery <nanley.g.chery at intel.com>
Reviewed-by: Jordan Justen <jordan.l.justen at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13206>

---

 src/intel/isl/isl_format.c     | 9 ++++-----
 src/intel/vulkan/anv_formats.c | 8 --------
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/src/intel/isl/isl_format.c b/src/intel/isl/isl_format.c
index 7b14db5d613..6a83a59f56c 100644
--- a/src/intel/isl/isl_format.c
+++ b/src/intel/isl/isl_format.c
@@ -721,12 +721,11 @@ isl_format_supports_sampling(const struct intel_device_info *devinfo,
       if (fmtl->txc == ISL_TXC_ETC1 || fmtl->txc == ISL_TXC_ETC2)
          return true;
    } else if (devinfo->is_cherryview) {
-      const struct isl_format_layout *fmtl = isl_format_get_layout(format);
-      /* Support for ASTC LDR exists on Cherry View even though big-core
-       * GPUs didn't get it until Skylake.
+      /* Support for ASTC LDR theoretically exists on Cherry View even though
+       * big-core GPUs didn't get it until Skylake.  However, it's fairly
+       * badly broken and requires some nasty workarounds which no Mesa driver
+       * has ever implemented.
        */
-      if (fmtl->txc == ISL_TXC_ASTC)
-         return format < ISL_FORMAT_ASTC_HDR_2D_4X4_FLT16;
    } else if (intel_device_info_is_9lp(devinfo)) {
       const struct isl_format_layout *fmtl = isl_format_get_layout(format);
       /* Support for ASTC HDR exists on Broxton even though big-core
diff --git a/src/intel/vulkan/anv_formats.c b/src/intel/vulkan/anv_formats.c
index 1713b446825..91c379c931b 100644
--- a/src/intel/vulkan/anv_formats.c
+++ b/src/intel/vulkan/anv_formats.c
@@ -603,14 +603,6 @@ anv_get_image_format_features(const struct intel_device_info *devinfo,
        isl_format_get_layout(plane_format.isl_format)->txc == ISL_TXC_ASTC)
       return 0;
 
-   /* ASTC requires nasty workarounds on BSW so we just disable it for now.
-    *
-    * TODO: Figure out the ASTC workarounds and re-enable on BSW.
-    */
-   if (devinfo->ver < 9 &&
-       isl_format_get_layout(plane_format.isl_format)->txc == ISL_TXC_ASTC)
-      return 0;
-
    if (isl_format_supports_sampling(devinfo, plane_format.isl_format)) {
       flags |= VK_FORMAT_FEATURE_SAMPLED_IMAGE_BIT;