panfrost: Get rid of the Sample Count enum

Sample count just needs a log2 modifier. While at it, rename the
"Multisample count" field "Sample count" to be consistent with
other descriptors.

Signed-off-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7653>

diff --git a/src/panfrost/lib/midgard.xml b/src/panfrost/lib/midgard.xml
index f4d0b00..97005c8 100644 (file)
--- a/src/panfrost/lib/midgard.xml
+++ b/src/panfrost/lib/midgard.xml
@@ -402,13 +402,6 @@
     <value name="Counter" value="3"/>
   </enum>
 
-  <enum name="Sample Count">
-    <value name="Samples 1x" value="0"/>
-    <value name="Samples 4x" value="2"/>
-    <value name="Samples 8x" value="3"/>
-    <value name="Samples 16x" value="4"/>
-  </enum>
-
   <enum name="Stencil Op">
     <value name="Keep" value="0"/>
     <value name="Replace" value="1"/>
@@ -733,7 +726,7 @@
     <field name="Levels" size="5" start="2:16" type="uint"/>
     <field name="Minimum level" size="5" start="2:24" type="uint"/>
     <field name="Minimum LOD" size="13" start="3:0" type="uint" default="0"/>
-    <field name="Multisample count" size="3" start="3:13" type="Sample Count" default="Samples 1x"/>
+    <field name="Sample count" size="3" start="3:13" type="uint" default="1" modifier="log2"/>
     <field name="Maximum LOD" size="13" start="3:16" type="uint" default="0"/>
     <field name="Surfaces" size="64" start="4:0" type="address"/>
     <field name="Array size" size="16" start="6:0" type="uint" modifier="minus(1)" default="1"/>