commit cae1be954cadbe0535a3147009072c46662ab198
author Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com> Wed Oct 28 14:14:48 2020 -0400
committer Marge Bot <eric+marge@anholt.net> Sat Oct 31 14:09:19 2020 +0000
tree 63a4a7d25df8344234468887af62011957717ca4
parent 870283bcc4ac2e2275d7ff6ddf455164f4f264a7

panfrost: Remove panfrost_is_z24s8_variant

Z16 supports AFBC too nowadays, so this helper is misleading.

Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Tested-by: Christian Hewitt <christianshewitt@gmail.com>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7352>

src/panfrost/lib/pan_afbc.c

diff --git a/src/panfrost/lib/pan_afbc.c b/src/panfrost/lib/pan_afbc.c
index bf9b117..cfd715f 100644
--- a/src/panfrost/lib/pan_afbc.c
+++ b/src/panfrost/lib/pan_afbc.c
@@ -92,17 +92,13 @@
         if (util_format_is_rgba8_variant(desc))
                 return true;
 
-        /* Only Z24S8 variants are compressible as Z/S */
-
-        if (panfrost_is_z24s8_variant(format))
-                return true;
-
-        /* Lookup special formats */
         switch (format) {
         case PIPE_FORMAT_R8G8B8_UNORM:
         case PIPE_FORMAT_B8G8R8_UNORM:
         case PIPE_FORMAT_R5G6B5_UNORM:
         case PIPE_FORMAT_B5G6R5_UNORM:
+        case PIPE_FORMAT_Z24_UNORM_S8_UINT:
+        case PIPE_FORMAT_Z24X8_UNORM:
         case PIPE_FORMAT_Z16_UNORM:
                 return true;
         default:

src/panfrost/lib/pan_format.c

diff --git a/src/panfrost/lib/pan_format.c b/src/panfrost/lib/pan_format.c
index acd7b37..3df7215 100644
--- a/src/panfrost/lib/pan_format.c
+++ b/src/panfrost/lib/pan_format.c
@@ -388,20 +388,6 @@
 #undef _T
 #undef _R
 
-/* Is a format encoded like Z24S8 and therefore compatible for render? */
-
-bool
-panfrost_is_z24s8_variant(enum pipe_format fmt)
-{
-        switch (fmt) {
-                case PIPE_FORMAT_Z24_UNORM_S8_UINT:
-                case PIPE_FORMAT_Z24X8_UNORM:
-                        return true;
-                default:
-                        return false;
-        }
-}
-
 /* Translate a PIPE swizzle quad to a 12-bit Mali swizzle code. PIPE
  * swizzles line up with Mali swizzles for the XYZW01, but PIPE swizzles have
  * an additional "NONE" field that we have to mask out to zero. Additionally,

src/panfrost/lib/pan_texture.h

diff --git a/src/panfrost/lib/pan_texture.h b/src/panfrost/lib/pan_texture.h
index 70f2ca2..e6ea701 100644
--- a/src/panfrost/lib/pan_texture.h
+++ b/src/panfrost/lib/pan_texture.h
@@ -153,9 +153,6 @@
 
 extern struct panfrost_format panfrost_pipe_format_table[PIPE_FORMAT_COUNT];
 
-bool
-panfrost_is_z24s8_variant(enum pipe_format fmt);
-
 enum mali_z_internal_format
 panfrost_get_z_internal_format(enum pipe_format fmt);