From 2e6369f5f63aa2900014000ea9de11eae73293de Mon Sep 17 00:00:00 2001
From: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Date: Sun, 23 Oct 2022 12:28:48 -0400
Subject: [PATCH] asahi: Identify PBE sample count

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19811>
---
 src/asahi/lib/cmdbuf.xml              | 18 +++++++-----------
 src/gallium/drivers/asahi/agx_state.c |  4 +---
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/asahi/lib/cmdbuf.xml b/src/asahi/lib/cmdbuf.xml
index 7f5db1d2e0b..852a045a912 100644
--- a/src/asahi/lib/cmdbuf.xml
+++ b/src/asahi/lib/cmdbuf.xml
@@ -183,6 +183,11 @@
     <value name="2D Array Multisampled" value="8"/>
   </enum>
 
+  <enum name="Sample Count">
+    <value name="2" value="0"/>
+    <value name="4" value="1"/>
+  </enum>
+
   <struct name="Render Target" size="24">
     <!-- 2D or 2D Multisampled, no layering -->
     <field name="Dimension" size="4" start="0" type="Texture dimension" default="2D"/>
@@ -198,12 +203,8 @@
     <field name="Unk 52" size="1" start="52" type="bool"/>
     <field name="Rotate 90" size="1" start="53" type="bool" default="false"/>
     <field name="Flip vertical" size="1" start="54" type="bool" default="false"/>
-    <!-- not 1c0, tried setting . setting 0x20/0x10/0x8 breaks render. not
-    0x4/0x2. 0x1 distorts in a funny way, renders upside-down with jitter
-    around the edges (like it's doing a 2x2 tiling or something).
-
-    When enabling mipmapping, Metal sets 0x8 and sets stride to 0x100009 -->
-    <field name="Unk 55" size="9" start="55" type="hex" default="0x00"/>
+    <field name="Samples" size="1" start="56" type="Sample Count"/>
+    <field name="Unk mipmapped" size="1" start="58" type="bool"/>
     <field name="Buffer" size="36" start="64" type="address" modifier="shr(4)"/>
     <!-- N.b. sRGB is not specified here -->
     <field name="Level" size="4" start="100" type="uint"/>
@@ -219,11 +220,6 @@
     <field name="Acceleration buffer" size="64" start="128" type="address"/>
   </struct>
 
-  <enum name="Sample Count">
-    <value name="2" value="0"/>
-    <value name="4" value="1"/>
-  </enum>
-
   <struct name="Texture" size="24">
     <field name="Dimension" size="4" start="0" type="Texture dimension" default="2D"/>
     <field name="Layout" size="2" start="4" type="Layout"/>
diff --git a/src/gallium/drivers/asahi/agx_state.c b/src/gallium/drivers/asahi/agx_state.c
index 3acc433c8a6..1df11155edf 100644
--- a/src/gallium/drivers/asahi/agx_state.c
+++ b/src/gallium/drivers/asahi/agx_state.c
@@ -830,9 +830,7 @@ agx_set_framebuffer_state(struct pipe_context *pctx,
          cfg.height = state->height;
          cfg.level = surf->u.tex.level;
          cfg.buffer = agx_map_texture_gpu(tex, layer);
-
-         if (tex->mipmapped)
-            cfg.unk_55 = 0x8;
+         cfg.unk_mipmapped = tex->mipmapped;
 
          if (tex->layout.tiling == AIL_TILING_LINEAR) {
             cfg.stride = ail_get_linear_stride_B(&tex->layout, level) - 4;