Mesa (main): genxml: fix compilation with P/I defines

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: e9b58116ea411491924d1100dd0b8c9189c32086
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e9b58116ea411491924d1100dd0b8c9189c32086

Author: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Date:   Tue Nov 23 14:57:21 2021 +0200

genxml: fix compilation with P/I defines

Those names are a bit too common and sometimes clash variables.

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Reviewed-by: Tapani Pälli <tapani.palli at intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13954>

---

 src/intel/genxml/gen11.xml  | 2 +-
 src/intel/genxml/gen12.xml  | 2 +-
 src/intel/genxml/gen125.xml | 2 +-
 src/intel/genxml/gen9.xml   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/intel/genxml/gen11.xml b/src/intel/genxml/gen11.xml
index d4bf7eaa404..9a23642806a 100644
--- a/src/intel/genxml/gen11.xml
+++ b/src/intel/genxml/gen11.xml
@@ -6622,7 +6622,7 @@
     <field name="HME Ref1 Disable" start="177" end="177" type="bool"/>
     <field name="MB Slice Threshold Value" start="178" end="181" type="uint"/>
     <field name="Constrained Intra Prediction" start="186" end="186" type="bool"/>
-    <field name="Picture Type" start="189" end="190" type="uint">
+    <field name="Picture Type" start="189" end="190" type="uint" prefix="PI">
       <value name="I" value="0"/>
       <value name="P" value="1"/>
     </field>
diff --git a/src/intel/genxml/gen12.xml b/src/intel/genxml/gen12.xml
index 09a06a5d55c..a60da84174d 100644
--- a/src/intel/genxml/gen12.xml
+++ b/src/intel/genxml/gen12.xml
@@ -6810,7 +6810,7 @@
     <field name="HME Ref1 Disable" start="177" end="177" type="bool"/>
     <field name="MB Slice Threshold Value" start="178" end="181" type="uint"/>
     <field name="Constrained Intra Prediction" start="186" end="186" type="bool"/>
-    <field name="Picture Type" start="189" end="190" type="uint">
+    <field name="Picture Type" start="189" end="190" type="uint" prefix="PI">
       <value name="I" value="0"/>
       <value name="P" value="1"/>
     </field>
diff --git a/src/intel/genxml/gen125.xml b/src/intel/genxml/gen125.xml
index 0445ec1b9a9..59d2232fb6a 100644
--- a/src/intel/genxml/gen125.xml
+++ b/src/intel/genxml/gen125.xml
@@ -7092,7 +7092,7 @@
     <field name="HME Ref1 Disable" start="177" end="177" type="bool"/>
     <field name="MB Slice Threshold Value" start="178" end="181" type="uint"/>
     <field name="Constrained Intra Prediction" start="186" end="186" type="bool"/>
-    <field name="Picture Type" start="189" end="190" type="uint">
+    <field name="Picture Type" start="189" end="190" type="uint" prefix="PI">
       <value name="I" value="0"/>
       <value name="P" value="1"/>
     </field>
diff --git a/src/intel/genxml/gen9.xml b/src/intel/genxml/gen9.xml
index e4946d7870b..a009fe28331 100644
--- a/src/intel/genxml/gen9.xml
+++ b/src/intel/genxml/gen9.xml
@@ -6207,7 +6207,7 @@
     <field name="HME Ref1 Disable" start="177" end="177" type="bool"/>
     <field name="MB Slice Threshold Value" start="178" end="181" type="uint"/>
     <field name="Constrained Intra Prediction" start="186" end="186" type="bool"/>
-    <field name="Picture Type" start="189" end="190" type="uint">
+    <field name="Picture Type" start="189" end="190" type="uint" prefix="PI">
       <value name="I" value="0"/>
       <value name="P" value="1"/>
     </field>