From: Kenneth Graunke <kenneth@whitecape.org>
Date: Thu, 6 Feb 2020 05:05:26 +0000 (-0800)
Subject: intel/genxml: Drop "reserved" enum
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a92be2fb26e6d470a6d2b179f35f54d75a7a7b90;p=mesa.git

intel/genxml: Drop "reserved" enum

This was adding "#define reserved 2" to genxml includes, which is a
fairly mean lowercase word to redefine.  It ends up breaking the build
on Android, which has __u32 reserved fields in headers.

Defining it also has no purpose.  Just drop it.

Fixes: 5bea0cf7795 ("intel/isl: Move iris's pipe-to-isl format function to isl.")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3729>
---

diff --git a/src/intel/genxml/gen6.xml b/src/intel/genxml/gen6.xml
index 3c52347d370..3940dc01d15 100644
--- a/src/intel/genxml/gen6.xml
+++ b/src/intel/genxml/gen6.xml
@@ -608,7 +608,6 @@
     <field name="Perspective Divide Disable" start="73" end="73" type="bool"/>
     <field name="Clip Mode" start="77" end="79" type="uint">
       <value name="CLIPMODE_NORMAL" value="0"/>
-      <value name="reserved" value="2"/>
       <value name="CLIPMODE_REJECT_ALL" value="3"/>
       <value name="CLIPMODE_ACCEPT_ALL" value="4"/>
     </field>