fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 20:28:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

intel/genxml: cleanup video xml collisions.

Browse source 
When you enable video genxml, lots of warnings about redefined things
appear, just clean those up before things get started.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13788>
This commit is contained in:
Dave Airlie 2021-11-09 09:54:32 +10:00 • committed by Marge Bot
parent d89461208b
commit 5d956d65b6
4 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/intel/genxml/gen11.xml
View file

@ -3094,7 +3094,7 @@
<value name="Intra" value="0"/>
<value name="Inter" value="1"/>
</field>
<field name="SizeID" start="33" end="34" type="uint">
<field name="SizeID" start="33" end="34" type="uint" prefix="SZ">
<value name="4x4" value="0"/>
<value name="8x8" value="1"/>
<value name="16x16" value="2"/>
@ -6607,11 +6607,11 @@
<field name="Sub-Pel Mode" start="140" end="141" type="uint"/>
<field name="Forward Transform Skip Check Enable" start="145" end="145" type="bool"/>
<field name="Block-Based Skip Enable" start="147" end="147" type="bool"/>
<field name="Inter SAD Measure Adjustment" start="148" end="149" type="uint">
<field name="Inter SAD Measure Adjustment" start="148" end="149" type="uint" prefix="ISMA">
<value name="None" value="0"/>
<value name="Haar Transform Adjusted" value="2"/>
</field>
<field name="Intra SAD Measure Adjustment" start="150" end="151" type="uint">
<field name="Intra SAD Measure Adjustment" start="150" end="151" type="uint" prefix="ISMA">
<value name="None" value="0"/>
<value name="Haar Transform Adjusted" value="2"/>
</field>
@ -6750,7 +6750,7 @@
<field name="Media Command Opcode" start="23" end="26" type="uint" default="1"/>
<field name="Pipeline" start="27" end="28" type="uint" default="2"/>
<field name="Command Type" start="29" end="31" type="uint" default="3"/>
<field name="Standard Select" start="32" end="35" type="uint">
<field name="Standard Select" start="32" end="35" type="uint" prefix="SS">
<value name="HEVC" value="0"/>
<value name="VP9" value="1"/>
<value name="AVC" value="2"/>

6
src/intel/genxml/gen12.xml
View file

@ -6795,11 +6795,11 @@
<field name="Sub-Pel Mode" start="140" end="141" type="uint"/>
<field name="Forward Transform Skip Check Enable" start="145" end="145" type="bool"/>
<field name="Block-Based Skip Enable" start="147" end="147" type="bool"/>
<field name="Inter SAD Measure Adjustment" start="148" end="149" type="uint">
<field name="Inter SAD Measure Adjustment" start="148" end="149" type="uint" prefix="ISMA">
<value name="None" value="0"/>
<value name="Haar Transform Adjusted" value="2"/>
</field>
<field name="Intra SAD Measure Adjustment" start="150" end="151" type="uint">
<field name="Intra SAD Measure Adjustment" start="150" end="151" type="uint" prefix="ISMA">
<value name="None" value="0"/>
<value name="Haar Transform Adjusted" value="2"/>
</field>
@ -6938,7 +6938,7 @@
<field name="Media Command Opcode" start="23" end="26" type="uint" default="1"/>
<field name="Pipeline" start="27" end="28" type="uint" default="2"/>
<field name="Command Type" start="29" end="31" type="uint" default="3"/>
<field name="Standard Select" start="32" end="35" type="uint">
<field name="Standard Select" start="32" end="35" type="uint" prefix="SS">
<value name="HEVC" value="0"/>
<value name="VP9" value="1"/>
<value name="AVC" value="2"/>

8
src/intel/genxml/gen125.xml
View file

@ -3721,7 +3721,7 @@
<value name="Intra" value="0"/>
<value name="Inter" value="1"/>
</field>
<field name="SizeID" start="33" end="34" type="uint">
<field name="SizeID" start="33" end="34" type="uint" prefix="SZ">
<value name="4x4" value="0"/>
<value name="8x8" value="1"/>
<value name="16x16" value="2"/>
@ -7077,11 +7077,11 @@
<field name="Sub-Pel Mode" start="140" end="141" type="uint"/>
<field name="Forward Transform Skip Check Enable" start="145" end="145" type="bool"/>
<field name="Block-Based Skip Enable" start="147" end="147" type="bool"/>
<field name="Inter SAD Measure Adjustment" start="148" end="149" type="uint">
<field name="Inter SAD Measure Adjustment" start="148" end="149" type="uint" prefix="ISMA">
<value name="None" value="0"/>
<value name="Haar Transform Adjusted" value="2"/>
</field>
<field name="Intra SAD Measure Adjustment" start="150" end="151" type="uint">
<field name="Intra SAD Measure Adjustment" start="150" end="151" type="uint" prefix="ISMA">
<value name="None" value="0"/>
<value name="Haar Transform Adjusted" value="2"/>
</field>
@ -7220,7 +7220,7 @@
<field name="Media Command Opcode" start="23" end="26" type="uint" default="1"/>
<field name="Pipeline" start="27" end="28" type="uint" default="2"/>
<field name="Command Type" start="29" end="31" type="uint" default="3"/>
<field name="Standard Select" start="32" end="35" type="uint">
<field name="Standard Select" start="32" end="35" type="uint" prefix="SS">
<value name="HEVC" value="0"/>
<value name="VP9" value="1"/>
<value name="AVC" value="2"/>

10
src/intel/genxml/gen9.xml
View file

@ -2879,7 +2879,7 @@
<value name="Intra" value="0"/>
<value name="Inter" value="1"/>
</field>
<field name="SizeID" start="33" end="34" type="uint">
<field name="SizeID" start="33" end="34" type="uint" prefix="SZ">
<value name="4x4" value="0"/>
<value name="8x8" value="1"/>
<value name="16x16" value="2"/>
@ -3153,7 +3153,7 @@
<value name="Intra" value="0"/>
<value name="Inter" value="1"/>
</field>
<field name="SizeID" start="33" end="34" type="uint">
<field name="SizeID" start="33" end="34" type="uint" prefix="SZ">
<value name="4x4" value="0"/>
<value name="8x8" value="1"/>
<value name="16x16" value="2"/>
@ -6192,11 +6192,11 @@
<field name="Sub-Pel Mode" start="140" end="141" type="uint"/>
<field name="Forward Transform Skip Check Enable" start="145" end="145" type="bool"/>
<field name="Block-Based Skip Enable" start="147" end="147" type="bool"/>
<field name="Inter SAD Measure Adjustment" start="148" end="149" type="uint">
<field name="Inter SAD Measure Adjustment" start="148" end="149" type="uint" prefix="ISMA">
<value name="None" value="0"/>
<value name="Haar Transform Adjusted" value="2"/>
</field>
<field name="Intra SAD Measure Adjustment" start="150" end="151" type="uint">
<field name="Intra SAD Measure Adjustment" start="150" end="151" type="uint" prefix="ISMA">
<value name="None" value="0"/>
<value name="Haar Transform Adjusted" value="2"/>
</field>
@ -6322,7 +6322,7 @@
<field name="Media Command Opcode" start="23" end="26" type="uint" default="1"/>
<field name="Pipeline" start="27" end="28" type="uint" default="2"/>
<field name="Command Type" start="29" end="31" type="uint" default="3"/>
<field name="Standard Select" start="32" end="35" type="uint">
<field name="Standard Select" start="32" end="35" type="uint" prefix="SS">
<value name="AVC" value="2"/>
</field>
<field name="Frame Statistics Stream-Out Enable" start="37" end="37" type="bool"/>