From f2a7943d84ec4d9a77a00fe0b5382f7fefa14492 Mon Sep 17 00:00:00 2001
From: Erik Faye-Lund <erik.faye-lund@collabora.com>
Date: Wed, 13 May 2026 12:27:21 +0200
Subject: [PATCH] pan/genxml: consistently use hex for masks

We do this for all masks from V12 and later, but not always in earlier
gens. Let's fix this up to both produce cleaner dumps, as well as reduce
needless diffs between the files.

Reviewed-by: Lars-Ivar Hesselberg Simonsen <lars-ivar.simonsen@arm.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/41721>
---
 src/panfrost/genxml/v10.xml |  2 +-
 src/panfrost/genxml/v4.xml  | 10 +++++-----
 src/panfrost/genxml/v5.xml  |  6 +++---
 src/panfrost/genxml/v6.xml  |  6 +++---
 src/panfrost/genxml/v7.xml  |  6 +++---
 src/panfrost/genxml/v9.xml  |  2 +-
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/panfrost/genxml/v10.xml b/src/panfrost/genxml/v10.xml
index a731425cf31..ecd47699a08 100644
--- a/src/panfrost/genxml/v10.xml
+++ b/src/panfrost/genxml/v10.xml
@@ -2146,7 +2146,7 @@
   </struct>
 
   <struct name="DCD Flags 1" size="1">
-    <field name="Sample mask" size="16" start="0" type="uint"/>
+    <field name="Sample mask" size="16" start="0" type="hex"/>
     <field name="Render target mask" start="16" size="8" type="hex"/>
   </struct>
 
diff --git a/src/panfrost/genxml/v4.xml b/src/panfrost/genxml/v4.xml
index c916b4c3a07..962077f1d4b 100644
--- a/src/panfrost/genxml/v4.xml
+++ b/src/panfrost/genxml/v4.xml
@@ -464,7 +464,7 @@
   <struct name="Blend Equation" size="1">
     <field name="RGB" size="12" start="0:0" type="Blend Function"/>
     <field name="Alpha" size="12" start="0:12" type="Blend Function"/>
-    <field name="Color Mask" size="4" start="0:28" type="uint"/>
+    <field name="Color Mask" size="4" start="0:28" type="hex"/>
   </struct>
 
   <struct name="Invocation">
@@ -638,7 +638,7 @@
   </struct>
 
   <struct name="Multisample, Misc" size="1">
-    <field name="Sample mask" size="16" start="0" type="uint"/>
+    <field name="Sample mask" size="16" start="0" type="hex"/>
     <field name="Multisample enable" size="1" start="16" type="bool"/>
     <field name="Multisample late coverage" size="1" start="17" type="bool"/>
     <field name="Evaluate per-sample" size="1" start="18" type="bool"/>
@@ -656,8 +656,8 @@
   </struct>
 
   <struct name="Stencil Mask, Misc" size="1">
-    <field name="Stencil mask front" size="8" start="0" type="uint"/>
-    <field name="Stencil mask back" size="8" start="8" type="uint"/>
+    <field name="Stencil mask front" size="8" start="0" type="hex"/>
+    <field name="Stencil mask back" size="8" start="8" type="hex"/>
     <field name="Stencil enable" size="1" start="16" type="bool"/>
     <field name="Alpha-to-coverage" size="1" start="17" type="bool"/>
     <field name="Alpha-to-coverage Invert" size="1" start="18" type="bool"/>
@@ -675,7 +675,7 @@
 
   <struct name="Stencil">
     <field name="Reference Value" size="8" start="0" type="uint"/>
-    <field name="Mask" size="8" start="8" type="uint"/>
+    <field name="Mask" size="8" start="8" type="hex"/>
     <field name="Compare Function" size="3" start="16" type="Func"/>
     <field name="Stencil Fail" size="3" start="19" type="Stencil Op"/>
     <field name="Depth Fail" size="3" start="22" type="Stencil Op"/>
diff --git a/src/panfrost/genxml/v5.xml b/src/panfrost/genxml/v5.xml
index a81b019fa04..7216277b5be 100644
--- a/src/panfrost/genxml/v5.xml
+++ b/src/panfrost/genxml/v5.xml
@@ -673,7 +673,7 @@
   </struct>
 
   <struct name="Multisample, Misc" size="1">
-    <field name="Sample mask" size="16" start="0" type="uint"/>
+    <field name="Sample mask" size="16" start="0" type="hex"/>
     <field name="Multisample enable" size="1" start="16" type="bool"/>
     <field name="Multisample late coverage" size="1" start="17" type="bool"/>
     <field name="Evaluate per-sample" size="1" start="18" type="bool"/>
@@ -688,8 +688,8 @@
   </struct>
 
   <struct name="Stencil Mask, Misc" size="1">
-    <field name="Stencil mask front" size="8" start="0" type="uint"/>
-    <field name="Stencil mask back" size="8" start="8" type="uint"/>
+    <field name="Stencil mask front" size="8" start="0" type="hex"/>
+    <field name="Stencil mask back" size="8" start="8" type="hex"/>
     <field name="Stencil enable" size="1" start="16" type="bool"/>
     <field name="Alpha-to-coverage" size="1" start="17" type="bool"/>
     <field name="Alpha-to-coverage Invert" size="1" start="18" type="bool"/>
diff --git a/src/panfrost/genxml/v6.xml b/src/panfrost/genxml/v6.xml
index c7d83eb0d49..dd864429d79 100644
--- a/src/panfrost/genxml/v6.xml
+++ b/src/panfrost/genxml/v6.xml
@@ -744,7 +744,7 @@
   </struct>
 
   <struct name="Multisample, Misc" size="1">
-    <field name="Sample mask" size="16" start="0" type="uint"/>
+    <field name="Sample mask" size="16" start="0" type="hex"/>
     <field name="Multisample enable" size="1" start="16" type="bool"/>
     <field name="Multisample late coverage" size="1" start="17" type="bool"/>
     <field name="Evaluate per-sample" size="1" start="18" type="bool"/>
@@ -761,8 +761,8 @@
   </struct>
 
   <struct name="Stencil Mask, Misc" size="1">
-    <field name="Stencil mask front" size="8" start="0" type="uint"/>
-    <field name="Stencil mask back" size="8" start="8" type="uint"/>
+    <field name="Stencil mask front" size="8" start="0" type="hex"/>
+    <field name="Stencil mask back" size="8" start="8" type="hex"/>
     <field name="Stencil enable" size="1" start="16" type="bool"/>
     <field name="Alpha-to-coverage" size="1" start="17" type="bool"/>
     <field name="Alpha-to-coverage Invert" size="1" start="18" type="bool"/>
diff --git a/src/panfrost/genxml/v7.xml b/src/panfrost/genxml/v7.xml
index ec7ea03e7fa..19a67ed94ce 100644
--- a/src/panfrost/genxml/v7.xml
+++ b/src/panfrost/genxml/v7.xml
@@ -817,7 +817,7 @@
   </struct>
 
   <struct name="Multisample, Misc" size="1">
-    <field name="Sample mask" size="16" start="0" type="uint"/>
+    <field name="Sample mask" size="16" start="0" type="hex"/>
     <field name="Multisample enable" size="1" start="16" type="bool"/>
     <field name="Multisample late coverage" size="1" start="17" type="bool"/>
     <field name="Evaluate per-sample" size="1" start="18" type="bool"/>
@@ -834,8 +834,8 @@
   </struct>
 
   <struct name="Stencil Mask, Misc" size="1">
-    <field name="Stencil mask front" size="8" start="0" type="uint"/>
-    <field name="Stencil mask back" size="8" start="8" type="uint"/>
+    <field name="Stencil mask front" size="8" start="0" type="hex"/>
+    <field name="Stencil mask back" size="8" start="8" type="hex"/>
     <field name="Stencil enable" size="1" start="16" type="bool"/>
     <field name="Alpha-to-coverage" size="1" start="17" type="bool"/>
     <field name="Alpha-to-coverage Invert" size="1" start="18" type="bool"/>
diff --git a/src/panfrost/genxml/v9.xml b/src/panfrost/genxml/v9.xml
index 1ecfa4e35e5..2e8cc9c8bbd 100644
--- a/src/panfrost/genxml/v9.xml
+++ b/src/panfrost/genxml/v9.xml
@@ -1596,7 +1596,7 @@
   </struct>
 
   <struct name="DCD Flags 1" size="1">
-    <field name="Sample mask" size="16" start="0" type="uint"/>
+    <field name="Sample mask" size="16" start="0" type="hex"/>
     <field name="Render target mask" start="16" size="8" type="hex"/>
   </struct>