[Mesa-dev] [PATCH] intel: genxml: make a couple of enums show up in aubinator
Kristian Høgsberg
hoegsberg at gmail.com
Fri Jun 30 17:11:49 UTC 2017
On Fri, Jun 30, 2017 at 9:25 AM, Lionel Landwerlin
<lionel.g.landwerlin at intel.com> wrote:
> In particular Shader Channel Select & Texture Address Control Mode.
>
> Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Nice,
Reviewed-by: Kristian H. Kristensen <hoegsberg at google.com>
> ---
> src/intel/genxml/gen10.xml | 14 +++++++-------
> src/intel/genxml/gen6.xml | 6 +++---
> src/intel/genxml/gen7.xml | 6 +++---
> src/intel/genxml/gen75.xml | 30 ++++++++++++++++--------------
> src/intel/genxml/gen8.xml | 22 +++++++++++-----------
> src/intel/genxml/gen9.xml | 14 +++++++-------
> 6 files changed, 47 insertions(+), 45 deletions(-)
>
> diff --git a/src/intel/genxml/gen10.xml b/src/intel/genxml/gen10.xml
> index a19674a435f..23c2adb9951 100644
> --- a/src/intel/genxml/gen10.xml
> +++ b/src/intel/genxml/gen10.xml
> @@ -787,10 +787,10 @@
> <value name="Vertical" value="1"/>
> </field>
> <field name="Memory Compression Enable" start="254" end="254" type="bool"/>
> - <field name="Shader Channel Select Red" start="249" end="251" type="uint"/>
> - <field name="Shader Channel Select Green" start="246" end="248" type="uint"/>
> - <field name="Shader Channel Select Blue" start="243" end="245" type="uint"/>
> - <field name="Shader Channel Select Alpha" start="240" end="242" type="uint"/>
> + <field name="Shader Channel Select Red" start="249" end="251" type="Shader Channel Select"/>
> + <field name="Shader Channel Select Green" start="246" end="248" type="Shader Channel Select"/>
> + <field name="Shader Channel Select Blue" start="243" end="245" type="Shader Channel Select"/>
> + <field name="Shader Channel Select Alpha" start="240" end="242" type="Shader Channel Select"/>
> <field name="Resource Min LOD" start="224" end="235" type="u4.8"/>
> <field name="Surface Base Address" start="256" end="319" type="address"/>
> <field name="X Offset for V Plane" start="368" end="381" type="uint"/>
> @@ -936,9 +936,9 @@
> </field>
> <field name="Non-normalized Coordinate Enable" start="106" end="106" type="bool"/>
> <field name="Reduction Type Enable" start="105" end="105" type="bool"/>
> - <field name="TCX Address Control Mode" start="102" end="104" type="uint"/>
> - <field name="TCY Address Control Mode" start="99" end="101" type="uint"/>
> - <field name="TCZ Address Control Mode" start="96" end="98" type="uint"/>
> + <field name="TCX Address Control Mode" start="102" end="104" type="Texture Coordinate Mode"/>
> + <field name="TCY Address Control Mode" start="99" end="101" type="Texture Coordinate Mode"/>
> + <field name="TCZ Address Control Mode" start="96" end="98" type="Texture Coordinate Mode"/>
> </struct>
>
> <struct name="SAMPLER_STATE_8X8_AVS_COEFFICIENTS" length="8">
> diff --git a/src/intel/genxml/gen6.xml b/src/intel/genxml/gen6.xml
> index 04986bef0d1..8aa03355055 100644
> --- a/src/intel/genxml/gen6.xml
> +++ b/src/intel/genxml/gen6.xml
> @@ -684,9 +684,9 @@
> <value name="CUBECTRLMODE_PROGRAMMED" value="0"/>
> <value name="CUBECTRLMODE_OVERRIDE" value="1"/>
> </field>
> - <field name="TCX Address Control Mode" start="38" end="40" type="uint"/>
> - <field name="TCY Address Control Mode" start="35" end="37" type="uint"/>
> - <field name="TCZ Address Control Mode" start="32" end="34" type="uint"/>
> + <field name="TCX Address Control Mode" start="38" end="40" type="Texture Coordinate Mode"/>
> + <field name="TCY Address Control Mode" start="35" end="37" type="Texture Coordinate Mode"/>
> + <field name="TCZ Address Control Mode" start="32" end="34" type="Texture Coordinate Mode"/>
> <field name="Border Color Pointer" start="69" end="95" type="offset"/>
> <field name="Monochrome Filter Height: Reserved" start="125" end="127" type="uint"/>
> <field name="Monochrome Filter Width" start="122" end="124" type="uint"/>
> diff --git a/src/intel/genxml/gen7.xml b/src/intel/genxml/gen7.xml
> index 2c297f3b95b..993d10264fa 100644
> --- a/src/intel/genxml/gen7.xml
> +++ b/src/intel/genxml/gen7.xml
> @@ -784,9 +784,9 @@
> <value name="LOW" value="3"/>
> </field>
> <field name="Non-normalized Coordinate Enable" start="106" end="106" type="bool"/>
> - <field name="TCX Address Control Mode" start="102" end="104" type="uint"/>
> - <field name="TCY Address Control Mode" start="99" end="101" type="uint"/>
> - <field name="TCZ Address Control Mode" start="96" end="98" type="uint"/>
> + <field name="TCX Address Control Mode" start="102" end="104" type="Texture Coordinate Mode"/>
> + <field name="TCY Address Control Mode" start="99" end="101" type="Texture Coordinate Mode"/>
> + <field name="TCZ Address Control Mode" start="96" end="98" type="Texture Coordinate Mode"/>
> </struct>
>
> <instruction name="3DPRIMITIVE" bias="2" length="7">
> diff --git a/src/intel/genxml/gen75.xml b/src/intel/genxml/gen75.xml
> index e7c06dc5819..105effa8cef 100644
> --- a/src/intel/genxml/gen75.xml
> +++ b/src/intel/genxml/gen75.xml
> @@ -362,6 +362,15 @@
> <value name="RAW" value="511"/>
> </enum>
>
> + <enum name="Shader Channel Select" prefix="SCS">
> + <value name="ZERO" value="0"/>
> + <value name="ONE" value="1"/>
> + <value name="RED" value="4"/>
> + <value name="GREEN" value="5"/>
> + <value name="BLUE" value="6"/>
> + <value name="ALPHA" value="7"/>
> + </enum>
> +
> <enum name="Texture Coordinate Mode" prefix="TCM">
> <value name="WRAP" value="0"/>
> <value name="MIRROR" value="1"/>
> @@ -691,17 +700,10 @@
> <field name="Green Clear Color" start="254" end="254" type="uint" />
> <field name="Blue Clear Color" start="253" end="253" type="uint" />
> <field name="Alpha Clear Color" start="252" end="252" type="uint" />
> - <field name="Shader Channel Select Red" start="249" end="251" type="uint">
> - <value name="SCS_ZERO" value="0"/>
> - <value name="SCS_ONE" value="1"/>
> - <value name="SCS_RED" value="4"/>
> - <value name="SCS_GREEN" value="5"/>
> - <value name="SCS_BLUE" value="6"/>
> - <value name="SCS_ALPHA" value="7"/>
> - </field>
> - <field name="Shader Channel Select Green" start="246" end="248" type="uint"/>
> - <field name="Shader Channel Select Blue" start="243" end="245" type="uint"/>
> - <field name="Shader Channel Select Alpha" start="240" end="242" type="uint"/>
> + <field name="Shader Channel Select Red" start="249" end="251" type="Shader Channel Select"/>
> + <field name="Shader Channel Select Green" start="246" end="248" type="Shader Channel Select"/>
> + <field name="Shader Channel Select Blue" start="243" end="245" type="Shader Channel Select"/>
> + <field name="Shader Channel Select Alpha" start="240" end="242" type="Shader Channel Select"/>
> <field name="Resource Min LOD" start="224" end="235" type="u4.8"/>
> </struct>
>
> @@ -805,9 +807,9 @@
> <value name="LOW" value="3"/>
> </field>
> <field name="Non-normalized Coordinate Enable" start="106" end="106" type="bool"/>
> - <field name="TCX Address Control Mode" start="102" end="104" type="uint"/>
> - <field name="TCY Address Control Mode" start="99" end="101" type="uint"/>
> - <field name="TCZ Address Control Mode" start="96" end="98" type="uint"/>
> + <field name="TCX Address Control Mode" start="102" end="104" type="Texture Coordinate Mode"/>
> + <field name="TCY Address Control Mode" start="99" end="101" type="Texture Coordinate Mode"/>
> + <field name="TCZ Address Control Mode" start="96" end="98" type="Texture Coordinate Mode"/>
> </struct>
>
> <struct name="MI_MATH_ALU_INSTRUCTION" length="1">
> diff --git a/src/intel/genxml/gen8.xml b/src/intel/genxml/gen8.xml
> index 2fd796a2e24..99c4aca8fb4 100644
> --- a/src/intel/genxml/gen8.xml
> +++ b/src/intel/genxml/gen8.xml
> @@ -732,14 +732,14 @@
> <field name="Separate UV Plane Enable" start="223" end="223" type="bool"/>
> <field name="X Offset for U or UV Plane" start="208" end="221" type="uint"/>
> <field name="Y Offset for U or UV Plane" start="192" end="205" type="uint"/>
> - <field name="Red Clear Color" start="255" end="255" type="uint"/>
> - <field name="Green Clear Color" start="254" end="254" type="uint"/>
> - <field name="Blue Clear Color" start="253" end="253" type="uint"/>
> - <field name="Alpha Clear Color" start="252" end="252" type="uint"/>
> - <field name="Shader Channel Select Red" start="249" end="251" type="uint"/>
> - <field name="Shader Channel Select Green" start="246" end="248" type="uint"/>
> - <field name="Shader Channel Select Blue" start="243" end="245" type="uint"/>
> - <field name="Shader Channel Select Alpha" start="240" end="242" type="uint"/>
> + <field name="Red Clear Color" start="255" end="255" type="Clear Color"/>
> + <field name="Green Clear Color" start="254" end="254" type="Clear Color"/>
> + <field name="Blue Clear Color" start="253" end="253" type="Clear Color"/>
> + <field name="Alpha Clear Color" start="252" end="252" type="Clear Color"/>
> + <field name="Shader Channel Select Red" start="249" end="251" type="Shader Channel Select"/>
> + <field name="Shader Channel Select Green" start="246" end="248" type="Shader Channel Select"/>
> + <field name="Shader Channel Select Blue" start="243" end="245" type="Shader Channel Select"/>
> + <field name="Shader Channel Select Alpha" start="240" end="242" type="Shader Channel Select"/>
> <field name="Resource Min LOD" start="224" end="235" type="u4.8"/>
> <field name="Surface Base Address" start="256" end="319" type="address"/>
> <field name="X Offset for V Plane" start="368" end="381" type="uint"/>
> @@ -847,9 +847,9 @@
> <value name="LOW" value="3"/>
> </field>
> <field name="Non-normalized Coordinate Enable" start="106" end="106" type="bool"/>
> - <field name="TCX Address Control Mode" start="102" end="104" type="uint"/>
> - <field name="TCY Address Control Mode" start="99" end="101" type="uint"/>
> - <field name="TCZ Address Control Mode" start="96" end="98" type="uint"/>
> + <field name="TCX Address Control Mode" start="102" end="104" type="Texture Coordinate Mode"/>
> + <field name="TCY Address Control Mode" start="99" end="101" type="Texture Coordinate Mode"/>
> + <field name="TCZ Address Control Mode" start="96" end="98" type="Texture Coordinate Mode"/>
> </struct>
>
> <struct name="SAMPLER_STATE_8X8_AVS_COEFFICIENTS" length="8">
> diff --git a/src/intel/genxml/gen9.xml b/src/intel/genxml/gen9.xml
> index af40e660771..1422463693d 100644
> --- a/src/intel/genxml/gen9.xml
> +++ b/src/intel/genxml/gen9.xml
> @@ -780,10 +780,10 @@
> <value name="Vertical" value="1"/>
> </field>
> <field name="Memory Compression Enable" start="254" end="254" type="bool"/>
> - <field name="Shader Channel Select Red" start="249" end="251" type="uint"/>
> - <field name="Shader Channel Select Green" start="246" end="248" type="uint"/>
> - <field name="Shader Channel Select Blue" start="243" end="245" type="uint"/>
> - <field name="Shader Channel Select Alpha" start="240" end="242" type="uint"/>
> + <field name="Shader Channel Select Red" start="249" end="251" type="Shader Channel Select"/>
> + <field name="Shader Channel Select Green" start="246" end="248" type="Shader Channel Select"/>
> + <field name="Shader Channel Select Blue" start="243" end="245" type="Shader Channel Select"/>
> + <field name="Shader Channel Select Alpha" start="240" end="242" type="Shader Channel Select"/>
> <field name="Resource Min LOD" start="224" end="235" type="u4.8"/>
> <field name="Surface Base Address" start="256" end="319" type="address"/>
> <field name="X Offset for V Plane" start="368" end="381" type="uint"/>
> @@ -905,9 +905,9 @@
> </field>
> <field name="Non-normalized Coordinate Enable" start="106" end="106" type="bool"/>
> <field name="Reduction Type Enable" start="105" end="105" type="bool"/>
> - <field name="TCX Address Control Mode" start="102" end="104" type="uint"/>
> - <field name="TCY Address Control Mode" start="99" end="101" type="uint"/>
> - <field name="TCZ Address Control Mode" start="96" end="98" type="uint"/>
> + <field name="TCX Address Control Mode" start="102" end="104" type="Texture Coordinate Mode"/>
> + <field name="TCY Address Control Mode" start="99" end="101" type="Texture Coordinate Mode"/>
> + <field name="TCZ Address Control Mode" start="96" end="98" type="Texture Coordinate Mode"/>
> </struct>
>
> <struct name="SAMPLER_STATE_8X8_AVS_COEFFICIENTS" length="8">
> --
> 2.13.2
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
More information about the mesa-dev
mailing list