From f96dc11e41df7d955a41d80ff1c0bf4cec6ee3bb Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Fri, 20 Sep 2024 08:55:23 -0400
Subject: [PATCH] zink: fix zink_format_is_voidable_rgba_variant()

this should just match whatever X formats are emulated

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31277>
---
 src/gallium/drivers/zink/zink_format.c | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/src/gallium/drivers/zink/zink_format.c b/src/gallium/drivers/zink/zink_format.c
index 0c916a1bf89..8253baec7e8 100644
--- a/src/gallium/drivers/zink/zink_format.c
+++ b/src/gallium/drivers/zink/zink_format.c
@@ -208,25 +208,7 @@ zink_format_emulate_x8(enum pipe_format format)
 bool
 zink_format_is_voidable_rgba_variant(enum pipe_format format)
 {
-   const struct util_format_description *desc = util_format_description(format);
-   unsigned chan;
-
-   if(desc->block.width != 1 ||
-      desc->block.height != 1 ||
-      (desc->block.bits != 32 && desc->block.bits != 64 &&
-       desc->block.bits != 128))
-      return false;
-
-   if (desc->nr_channels != 4)
-      return false;
-
-   unsigned size = desc->channel[0].size;
-   for(chan = 0; chan < 4; ++chan) {
-      if(desc->channel[chan].size != size)
-         return false;
-   }
-
-   return true;
+   return format != zink_format_emulate_x8(format);
 }
 
 void