asahi: Identify varying descriptor fields

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11718>

diff --git a/src/asahi/lib/cmdbuf.xml b/src/asahi/lib/cmdbuf.xml
index c28f343..2a13fdd 100644 (file)
--- a/src/asahi/lib/cmdbuf.xml
+++ b/src/asahi/lib/cmdbuf.xml
@@ -129,14 +129,22 @@
     <value name="XR" value="5"/>
   </enum>
 
-  <struct name="Varying header" size="8">
+  <struct name="Varying header" size="4">
     <field name="Slots 1" size="8" start="0:0" type="uint"/>
     <field name="Slots 2" size="8" start="0:8" type="uint"/>
-    <field name="Unk 1" size="32" start="1:0" type="hex" default="12"/>
   </struct>
 
+  <enum name="Varying Type">
+    <value name="Flat (first)" value="0"/>
+    <value name="Flat (last)" value="2"/>
+    <value name="Fragcoord W" value="3"/>
+    <value name="Smooth" value="7"/>
+    <value name="Fragcoord Z" value="11"/>
+  </enum>
+
   <struct name="Varying" size="4">
-    <field name="Unk" size="8" start="0" type="hex" default="0x1F"/>
+    <field name="Components" size="2" start="0" type="uint" modifier="minus(1)"/>
+    <field name="Type" size="6" start="2" type="Varying Type" default="Smooth"/>
     <field name="Slot 1" size="8" start="8" type="uint"/>
     <field name="Slot 2" size="8" start="16" type="uint"/>
   </struct>

diff --git a/src/gallium/drivers/asahi/agx_state.c b/src/gallium/drivers/asahi/agx_state.c
index 5267b81..26b9936 100644 (file)
--- a/src/gallium/drivers/asahi/agx_state.c
+++ b/src/gallium/drivers/asahi/agx_state.c
@@ -831,7 +831,7 @@ agx_update_shader(struct agx_context *ctx, struct agx_compiled_shader **out,
 
    compiled->varying_count = varying_count;
 
-   unsigned varying_desc_len = AGX_VARYING_HEADER_LENGTH + varying_count * AGX_VARYING_LENGTH;
+   unsigned varying_desc_len = AGX_VARYING_HEADER_LENGTH + (1 + varying_count) * AGX_VARYING_LENGTH;
    uint8_t *varying_desc = calloc(1, varying_desc_len);
 
    agx_pack(varying_desc, VARYING_HEADER, cfg) {
@@ -839,10 +839,18 @@ agx_update_shader(struct agx_context *ctx, struct agx_compiled_shader **out,
       cfg.slots_2 = 1 + (4 * varying_count);
    }
 
+   agx_pack(varying_desc + AGX_VARYING_HEADER_LENGTH, VARYING, cfg) {
+      cfg.type = AGX_VARYING_TYPE_FRAGCOORD_W;
+      cfg.slot_1 = 0;
+      cfg.slot_2 = 0;
+      cfg.components = 4;
+   }
+
    for (unsigned i = 0; i < varying_count; ++i) {
-      agx_pack(varying_desc + AGX_VARYING_HEADER_LENGTH + (i * AGX_VARYING_LENGTH), VARYING, cfg) {
+      agx_pack(varying_desc + AGX_VARYING_HEADER_LENGTH + ((i + 1) * AGX_VARYING_LENGTH), VARYING, cfg) {
          cfg.slot_1 = 1 + (4 * i);
          cfg.slot_2 = 1 + (4 * i);
+         cfg.components = 4;
       }
    }