intel/genxml: Drop "reserved" enum
authorKenneth Graunke <kenneth@whitecape.org>
Thu, 6 Feb 2020 05:05:26 +0000 (21:05 -0800)
committerKenneth Graunke <kenneth@whitecape.org>
Thu, 6 Feb 2020 05:31:27 +0000 (21:31 -0800)
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>

src/intel/genxml/gen6.xml

index 3c52347d370ba2efc84a626043cb639194109e7b..3940dc01d15f43ebebe14eddfd379322f22e1cbe 100644 (file)
     <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>