From 623a2bf488c4bfa4b6ac7e336f2650c224cbd095 Mon Sep 17 00:00:00 2001
From: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Date: Fri, 2 Dec 2022 12:53:02 -0500
Subject: [PATCH] asahi: Identify XML for more flatshading controls

Names from PowerVR <3

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

diff --git a/src/asahi/lib/cmdbuf.xml b/src/asahi/lib/cmdbuf.xml
index 8bb1a654bee..76f620efee5 100644
--- a/src/asahi/lib/cmdbuf.xml
+++ b/src/asahi/lib/cmdbuf.xml
@@ -433,11 +433,15 @@
     <field name="W Clamp" size="32" start="0" type="float"/>
   </struct>
 
+  <enum name="PPP Vertex">
+    <value name="0" value="1"/>
+    <value name="2" value="3"/>
+  </enum>
+
   <struct name="Cull" size="4">
     <field name="Cull front" size="1" start="0" type="bool"/>
     <field name="Cull back" size="1" start="1" type="bool"/>
-    <field name="Unk GL 1" size="1" start="7" type="bool"/>
-    <field name="Unk GL 2" size="1" start="8" type="bool"/>
+    <field name="Flat shading vertex" size="2" start="7" type="PPP Vertex"/>
     <field name="Depth clip" size="1" start="10" type="bool"/>
     <field name="Depth clamp" size="1" start="11" type="bool"/>
     <field name="Front face CCW" size="1" start="16" type="bool"/>
@@ -677,8 +681,13 @@
     <field name="Output count 2" size="8" start="8" type="uint" default="0"/>
   </struct>
 
+  <enum name="VDM Vertex">
+    <value name="0" value="0"/>
+    <value name="2" value="2"/>
+  </enum>
+
   <struct name="VDM State Vertex Unknown" size="4">
-    <field name="Unknown" start="0" size="1" type="bool"/>
+    <field name="Flat shading control" start="0" size="2" type="VDM Vertex"/>
   </struct>
 
   <!--- Command to issue a direct non-indexed draw -->
diff --git a/src/gallium/drivers/asahi/agx_state.c b/src/gallium/drivers/asahi/agx_state.c
index 7be0b93f3be..f4461c8e2fe 100644
--- a/src/gallium/drivers/asahi/agx_state.c
+++ b/src/gallium/drivers/asahi/agx_state.c
@@ -1821,8 +1821,6 @@ agx_encode_state(struct agx_batch *batch, uint8_t *out,
       out += AGX_VDM_STATE_VERTEX_OUTPUTS_LENGTH;
 
       agx_pack(out, VDM_STATE_VERTEX_UNKNOWN, cfg) {
-         /* XXX: This is probably wrong */
-         cfg.unknown = tex_count >= 4;
       }
       out += AGX_VDM_STATE_VERTEX_UNKNOWN_LENGTH;