From ea58edaafbfe0234c6ef07a77f5c4305493acdd5 Mon Sep 17 00:00:00 2001
From: Alyssa Rosenzweig <alyssa@collabora.com>
Date: Fri, 30 Sep 2022 21:16:35 -0400
Subject: [PATCH] asahi: Use a header more like Intel's GenXML

We're trying to converge on a common schema.

Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18922>
---
 src/asahi/lib/cmdbuf.xml  | 6 ++++--
 src/asahi/lib/gen_pack.py | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/asahi/lib/cmdbuf.xml b/src/asahi/lib/cmdbuf.xml
index e0b28bc..4ea3c5d 100644
--- a/src/asahi/lib/cmdbuf.xml
+++ b/src/asahi/lib/cmdbuf.xml
@@ -1,4 +1,6 @@
-<agxml>
+<?xml version="1.0" ?>
+<genxml>
+
   <enum name="Channel">
     <value name="R" value="0"/>
     <value name="G" value="1"/>
@@ -902,4 +904,4 @@
     <field name="Count" start="3:0" size="32" type="uint"/>
   </struct>
 
-</agxml>
+</genxml>
diff --git a/src/asahi/lib/gen_pack.py b/src/asahi/lib/gen_pack.py
index 7d62076..8584eb3 100644
--- a/src/asahi/lib/gen_pack.py
+++ b/src/asahi/lib/gen_pack.py
@@ -522,7 +522,7 @@ class Parser(object):
         return '{}_{}'.format(global_prefix.upper(), name)
 
     def start_element(self, name, attrs):
-        if name == "agxml":
+        if name == "genxml":
             print(pack_header)
         elif name == "struct":
             name = attrs["name"]
@@ -559,7 +559,7 @@ class Parser(object):
         elif name  == "enum":
             self.emit_enum()
             self.enum = None
-        elif name == "agxml":
+        elif name == "genxml":
             print('#endif')
 
     def emit_header(self, name):
-- 
2.7.4