Mesa (master): panfrost: Remove padded unorm blendable formats

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: ebc07f4b2f33b7730c9729094692f8aa2ee9ccf2
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ebc07f4b2f33b7730c9729094692f8aa2ee9ccf2

Author: Alyssa Rosenzweig <alyssa at collabora.com>
Date:   Mon Apr 19 15:27:21 2021 -0400

panfrost: Remove padded unorm blendable formats

These are used to effectively disable dithering on the tilebuffer, but
we already disable dithering on a per-primitive basis anyway, so don't
bother.

Signed-off-by: Alyssa Rosenzweig <alyssa at collabora.com>
Reviewed-by: Boris Brezillon <boris.brezillon at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10188>

---

 src/panfrost/lib/pan_format.c  | 4 +---
 src/panfrost/lib/pan_texture.h | 3 +--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/panfrost/lib/pan_format.c b/src/panfrost/lib/pan_format.c
index 74328488e54..d7519edb641 100644
--- a/src/panfrost/lib/pan_format.c
+++ b/src/panfrost/lib/pan_format.c
@@ -49,7 +49,6 @@
                 MALI_COLOR_BUFFER_INTERNAL_FORMAT_## internal, \
                 MALI_MFBD_COLOR_FORMAT_## writeback, \
                 MALI_BLEND_AU_ ## internal | (srgb ? (1 << 20) : 0), \
-                MALI_BLEND_PU_ ## internal | (srgb ? (1 << 20) : 0), \
         }
 
 #define BFMT(pipe, internal_and_writeback) \
@@ -699,8 +698,7 @@ unsigned
 panfrost_format_to_bifrost_blend(const struct panfrost_device *dev,
                                  enum pipe_format format)
 {
-        mali_pixel_format pixfmt =
-                panfrost_blendable_formats[format].bifrost_dither;
+        mali_pixel_format pixfmt = panfrost_blendable_formats[format].bifrost;
 
         if (pixfmt) {
                 return pixfmt | ((dev->quirks & HAS_SWIZZLES) ?
diff --git a/src/panfrost/lib/pan_texture.h b/src/panfrost/lib/pan_texture.h
index d62bf8e2a2b..34f43df32b3 100644
--- a/src/panfrost/lib/pan_texture.h
+++ b/src/panfrost/lib/pan_texture.h
@@ -201,8 +201,7 @@ panfrost_texture_offset(const struct pan_image_layout *layout,
 struct pan_blendable_format {
         enum mali_color_buffer_internal_format internal;
         enum mali_mfbd_color_format writeback;
-        mali_pixel_format bifrost_dither;
-        mali_pixel_format bifrost_no_dither;
+        mali_pixel_format bifrost;
 };
 
 extern const struct pan_blendable_format panfrost_blendable_formats[PIPE_FORMAT_COUNT];