From 700a88233b7d8a15e05fc4e2c72e25a974697761 Mon Sep 17 00:00:00 2001
From: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Date: Wed, 30 Jul 2025 14:54:07 -0400
Subject: [PATCH] asahi: rename compressed 1 to just compressed

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36399>
---
 src/asahi/genxml/cmdbuf.xml           | 4 ++--
 src/asahi/vulkan/hk_image_view.c      | 4 ++--
 src/gallium/drivers/asahi/agx_state.c | 8 +++-----
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/asahi/genxml/cmdbuf.xml b/src/asahi/genxml/cmdbuf.xml
index 177a6e1f1e8..bb63887bde0 100644
--- a/src/asahi/genxml/cmdbuf.xml
+++ b/src/asahi/genxml/cmdbuf.xml
@@ -232,7 +232,7 @@
     <field name="Flip vertical" size="1" start="54" type="bool"/>
     <field name="Samples" size="1" start="56" type="Sample Count"/>
     <field name="Unk mipmapped" size="1" start="58" type="bool"/>
-    <field name="Compressed 1" size="1" start="59" type="bool"/>
+    <field name="Compressed" size="1" start="59" type="bool"/>
     <field name="Mode" size="2" start="60" type="Image Mode"/>
     <field name="Buffer" size="36" start="64" type="address" modifier="shr(4)"/>
     <field name="Level" size="4" start="100" type="uint"/>
@@ -294,7 +294,7 @@
     to switch tile size (or disable tiling altogether?) at small mip levels to
     reduce wasted memory due to padding. Causing test flakiness when set. -->
     <field name="Unk mipmapped" size="1" start="102" type="bool"/>
-    <field name="Compressed 1" size="1" start="103" type="bool"/>
+    <field name="Compressed" size="1" start="103" type="bool"/>
     <field name="Mode" size="2" start="104" type="Image Mode"/>
     <field name="Compression" size="2" start="106" type="hex"/> <!-- 0 for uncompressed -->
     <field name="sRGB" size="1" start="108" type="bool"/>
diff --git a/src/asahi/vulkan/hk_image_view.c b/src/asahi/vulkan/hk_image_view.c
index b5aa20af55b..12b748906e4 100644
--- a/src/asahi/vulkan/hk_image_view.c
+++ b/src/asahi/vulkan/hk_image_view.c
@@ -328,7 +328,7 @@ pack_texture(struct hk_image_view *view, unsigned view_plane,
       cfg.srgb_2_channel = cfg.srgb && util_format_colormask(desc) == 0x3;
 
       if (layout->compressed) {
-         cfg.compressed_1 = true;
+         cfg.compressed = true;
          cfg.extended = true;
       }
 
@@ -482,7 +482,7 @@ pack_pbe(struct hk_device *dev, struct hk_image_view *view, unsigned view_plane,
       }
 
       if (layout->compressed && usage != HK_DESC_USAGE_EMRT) {
-         cfg.compressed_1 = true;
+         cfg.compressed = true;
          cfg.extended = true;
 
          cfg.acceleration_buffer = base_addr + layout->metadata_offset_B +
diff --git a/src/gallium/drivers/asahi/agx_state.c b/src/gallium/drivers/asahi/agx_state.c
index 300c776a75f..5b25c21ac2e 100644
--- a/src/gallium/drivers/asahi/agx_state.c
+++ b/src/gallium/drivers/asahi/agx_state.c
@@ -716,10 +716,8 @@ agx_pack_texture(void *out, struct agx_resource *rsrc,
       cfg.unk_mipmapped = rsrc->mipmapped;
       cfg.srgb_2_channel = cfg.srgb && util_format_colormask(desc) == 0x3;
 
-      if (rsrc->layout.compressed) {
-         cfg.compressed_1 = true;
-         cfg.extended = true;
-      }
+      cfg.compressed = rsrc->layout.compressed;
+      cfg.extended = cfg.compressed;
 
       cfg.address = agx_map_texture_gpu(rsrc, first_layer);
 
@@ -1259,7 +1257,7 @@ agx_batch_upload_pbe(struct agx_batch *batch, struct agx_pbe_packed *out,
       }
 
       if (tex->layout.compressed && !emrt) {
-         cfg.compressed_1 = true;
+         cfg.compressed = true;
          cfg.extended = true;
 
          cfg.acceleration_buffer =