From 4a3d5acc1df7e44b1e4034d4bf0c7d1b3f5be0d2 Mon Sep 17 00:00:00 2001
From: Ludvig Lindau <ludvig.lindau@arm.com>
Date: Tue, 26 Aug 2025 11:29:56 +0000
Subject: [PATCH] pan/genxml: Move BufferDescriptor for v9+

This change is required by the next commit.

Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37007>
---
 src/panfrost/genxml/v10.xml | 29 +++++++++++++++--------------
 src/panfrost/genxml/v12.xml | 36 ++++++++++++++++++------------------
 src/panfrost/genxml/v13.xml | 36 ++++++++++++++++++------------------
 src/panfrost/genxml/v9.xml  | 30 +++++++++++++++---------------
 4 files changed, 66 insertions(+), 65 deletions(-)

diff --git a/src/panfrost/genxml/v10.xml b/src/panfrost/genxml/v10.xml
index 43382a5154b..31cf040504b 100644
--- a/src/panfrost/genxml/v10.xml
+++ b/src/panfrost/genxml/v10.xml
@@ -951,20 +951,6 @@
     <field name="Divisor D" size="32" start="5:0" type="uint"/>
   </struct>
 
-  <struct name="Buffer" size="8" align="32">
-    <field name="Type" size="4" start="0:0" type="Descriptor Type" default="Buffer"/>
-    <field name="Buffer type" size="4" start="0:4" type="Buffer Type" default="Simple"/>
-    <field name="Size" size="32" start="1:0" type="uint"/>
-    <field name="Address" size="64" start="2:0" type="address"/>
-
-    <!-- Structured buffer only -->
-    <field name="Stride" size="32" start="4:0" type="uint"/>
-
-    <!-- Vertex packet buffer only -->
-    <field name="Packet stride" size="16" start="4:0" type="uint" modifier="shr(6)"/>
-    <field name="Attribute stride" size="16" start="4:16" type="uint"/>
-
-  </struct>
 
   <enum name="Blend Operand A">
     <value name="Zero" value="1"/>
@@ -1055,6 +1041,21 @@
     <field name="Internal" size="64" start="2:0" type="Internal Blend"/>
   </struct>
 
+  <struct name="Buffer" size="8" align="32">
+    <field name="Type" size="4" start="0:0" type="Descriptor Type" default="Buffer"/>
+    <field name="Buffer type" size="4" start="0:4" type="Buffer Type" default="Simple"/>
+    <field name="Size" size="32" start="1:0" type="uint"/>
+    <field name="Address" size="64" start="2:0" type="address"/>
+
+    <!-- Structured buffer only -->
+    <field name="Stride" size="32" start="4:0" type="uint"/>
+
+    <!-- Vertex packet buffer only -->
+    <field name="Packet stride" size="16" start="4:0" type="uint" modifier="shr(6)"/>
+    <field name="Attribute stride" size="16" start="4:16" type="uint"/>
+
+  </struct>
+
   <enum name="Point Size Array Format">
     <value name="None" value="0"/>
     <value name="FP16" value="2"/>
diff --git a/src/panfrost/genxml/v12.xml b/src/panfrost/genxml/v12.xml
index c69cc0c0973..a6b06c3fb6a 100644
--- a/src/panfrost/genxml/v12.xml
+++ b/src/panfrost/genxml/v12.xml
@@ -1187,24 +1187,6 @@
     <field name="Divisor D" size="32" start="5:0" type="uint"/>
   </struct>
 
-  <struct name="Buffer" size="8" align="32">
-    <field name="Type" size="4" start="0:0" type="Descriptor Type" default="Buffer"/>
-    <field name="Buffer type" size="4" start="0:4" type="Buffer Type" default="Simple"/>
-    <field name="Size" size="32" start="1:0" type="uint"/>
-    <field name="Address" size="64" start="2:0" type="address"/>
-
-    <!-- Not for Tiler heap -->
-    <field name="Size hi" size="32" start="5:0" type="uint"/>
-
-    <!-- Structured buffer only -->
-    <field name="Stride" size="32" start="4:0" type="uint"/>
-
-    <!-- Vertex packet buffer only -->
-    <field name="Packet stride" size="16" start="4:0" type="uint" modifier="shr(6)"/>
-    <field name="Attribute stride" size="16" start="4:16" type="uint"/>
-
-  </struct>
-
   <enum name="Blend Operand A">
     <value name="Zero" value="1"/>
     <value name="Src" value="2"/>
@@ -1294,6 +1276,24 @@
     <field name="Internal" size="64" start="2:0" type="Internal Blend"/>
   </struct>
 
+  <struct name="Buffer" size="8" align="32">
+    <field name="Type" size="4" start="0:0" type="Descriptor Type" default="Buffer"/>
+    <field name="Buffer type" size="4" start="0:4" type="Buffer Type" default="Simple"/>
+    <field name="Size" size="32" start="1:0" type="uint"/>
+    <field name="Address" size="64" start="2:0" type="address"/>
+
+    <!-- Not for Tiler heap -->
+    <field name="Size hi" size="32" start="5:0" type="uint"/>
+
+    <!-- Structured buffer only -->
+    <field name="Stride" size="32" start="4:0" type="uint"/>
+
+    <!-- Vertex packet buffer only -->
+    <field name="Packet stride" size="16" start="4:0" type="uint" modifier="shr(6)"/>
+    <field name="Attribute stride" size="16" start="4:16" type="uint"/>
+
+  </struct>
+
   <enum name="Point Size Array Format">
     <value name="None" value="0"/>
     <value name="FP16" value="2"/>
diff --git a/src/panfrost/genxml/v13.xml b/src/panfrost/genxml/v13.xml
index 2322426c2bd..857e9d72505 100644
--- a/src/panfrost/genxml/v13.xml
+++ b/src/panfrost/genxml/v13.xml
@@ -1496,24 +1496,6 @@
     <field name="Divisor D" size="32" start="5:0" type="uint"/>
   </struct>
 
-  <struct name="Buffer" size="8" align="32">
-    <field name="Type" size="4" start="0:0" type="Descriptor Type" default="Buffer"/>
-    <field name="Buffer type" size="4" start="0:4" type="Buffer Type" default="Simple"/>
-    <field name="Size" size="32" start="1:0" type="uint"/>
-    <field name="Address" size="64" start="2:0" type="address"/>
-
-    <!-- Not for Tiler heap -->
-    <field name="Size hi" size="32" start="5:0" type="uint"/>
-
-    <!-- Structured buffer only -->
-    <field name="Stride" size="32" start="4:0" type="uint"/>
-
-    <!-- Vertex packet buffer only -->
-    <field name="Packet stride" size="16" start="4:0" type="uint" modifier="shr(6)"/>
-    <field name="Attribute stride" size="16" start="4:16" type="uint"/>
-
-  </struct>
-
   <enum name="Blend Operand A">
     <value name="Zero" value="1"/>
     <value name="Src" value="2"/>
@@ -1603,6 +1585,24 @@
     <field name="Internal" size="64" start="2:0" type="Internal Blend"/>
   </struct>
 
+  <struct name="Buffer" size="8" align="32">
+    <field name="Type" size="4" start="0:0" type="Descriptor Type" default="Buffer"/>
+    <field name="Buffer type" size="4" start="0:4" type="Buffer Type" default="Simple"/>
+    <field name="Size" size="32" start="1:0" type="uint"/>
+    <field name="Address" size="64" start="2:0" type="address"/>
+
+    <!-- Not for Tiler heap -->
+    <field name="Size hi" size="32" start="5:0" type="uint"/>
+
+    <!-- Structured buffer only -->
+    <field name="Stride" size="32" start="4:0" type="uint"/>
+
+    <!-- Vertex packet buffer only -->
+    <field name="Packet stride" size="16" start="4:0" type="uint" modifier="shr(6)"/>
+    <field name="Attribute stride" size="16" start="4:16" type="uint"/>
+
+  </struct>
+
   <enum name="FIFO format">
     <value name="Auto" value="0"/>
     <value name="Basic" value="1"/>
diff --git a/src/panfrost/genxml/v9.xml b/src/panfrost/genxml/v9.xml
index ebaac60647c..2c8139c5358 100644
--- a/src/panfrost/genxml/v9.xml
+++ b/src/panfrost/genxml/v9.xml
@@ -498,21 +498,6 @@
     <field name="Divisor D" size="32" start="5:0" type="uint"/>
   </struct>
 
-  <struct name="Buffer" size="8" align="32">
-    <field name="Type" size="4" start="0:0" type="Descriptor Type" default="Buffer"/>
-    <field name="Buffer type" size="4" start="0:4" type="Buffer Type" default="Simple"/>
-    <field name="Size" size="32" start="1:0" type="uint"/>
-    <field name="Address" size="64" start="2:0" type="address"/>
-
-    <!-- Structured buffer only -->
-    <field name="Stride" size="32" start="4:0" type="uint"/>
-
-    <!-- Vertex packet buffer only -->
-    <field name="Packet stride" size="16" start="4:0" type="uint" modifier="shr(6)"/>
-    <field name="Attribute stride" size="16" start="4:16" type="uint"/>
-
-  </struct>
-
   <enum name="Blend Operand A">
     <value name="Zero" value="1"/>
     <value name="Src" value="2"/>
@@ -602,6 +587,21 @@
     <field name="Internal" size="64" start="2:0" type="Internal Blend"/>
   </struct>
 
+  <struct name="Buffer" size="8" align="32">
+    <field name="Type" size="4" start="0:0" type="Descriptor Type" default="Buffer"/>
+    <field name="Buffer type" size="4" start="0:4" type="Buffer Type" default="Simple"/>
+    <field name="Size" size="32" start="1:0" type="uint"/>
+    <field name="Address" size="64" start="2:0" type="address"/>
+
+    <!-- Structured buffer only -->
+    <field name="Stride" size="32" start="4:0" type="uint"/>
+
+    <!-- Vertex packet buffer only -->
+    <field name="Packet stride" size="16" start="4:0" type="uint" modifier="shr(6)"/>
+    <field name="Attribute stride" size="16" start="4:16" type="uint"/>
+
+  </struct>
+
   <enum name="Point Size Array Format">
     <value name="None" value="0"/>
     <value name="FP16" value="2"/>