Module: Mesa Branch: master Commit: 993babc01432bf7d088bc5433e9b5ac2d6cd0c69 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=993babc01432bf7d088bc5433e9b5ac2d6cd0c69
Author: Kristian H. Kristensen <[email protected]> Date: Mon Nov 28 16:38:04 2016 -0800 intel/genxml: Use 3D_Compare_Function for gen8+ test functions When the state fields where shuffled around for gen8, the compare function enums were downgraded to just uints. Change them to enum 3D_Compare_Function. Signed-off-by: Kristian H. Kristensen <[email protected]> Reviewed-by: Jason Ekstrand <[email protected]> --- src/intel/genxml/gen8.xml | 8 ++++---- src/intel/genxml/gen9.xml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/intel/genxml/gen8.xml b/src/intel/genxml/gen8.xml index 66d1639..e822044 100644 --- a/src/intel/genxml/gen8.xml +++ b/src/intel/genxml/gen8.xml @@ -551,7 +551,7 @@ <field name="Alpha To One Enable" start="29" end="29" type="bool"/> <field name="Alpha To Coverage Dither Enable" start="28" end="28" type="bool"/> <field name="Alpha Test Enable" start="27" end="27" type="bool"/> - <field name="Alpha Test Function" start="24" end="26" type="uint"/> + <field name="Alpha Test Function" start="24" end="26" type="3D_Compare_Function"/> <field name="Color Dither Enable" start="23" end="23" type="bool"/> <field name="X Dither Offset" start="21" end="22" type="uint"/> <field name="Y Dither Offset" start="19" end="20" type="uint"/> @@ -2373,12 +2373,12 @@ <field name="Stencil Fail Op" start="61" end="63" type="uint"/> <field name="Stencil Pass Depth Fail Op" start="58" end="60" type="uint"/> <field name="Stencil Pass Depth Pass Op" start="55" end="57" type="uint"/> - <field name="Backface Stencil Test Function" start="52" end="54" type="uint"/> + <field name="Backface Stencil Test Function" start="52" end="54" type="3D_Compare_Function"/> <field name="Backface Stencil Fail Op" start="49" end="51" type="uint"/> <field name="Backface Stencil Pass Depth Fail Op" start="46" end="48" type="uint"/> <field name="Backface Stencil Pass Depth Pass Op" start="43" end="45" type="uint"/> - <field name="Stencil Test Function" start="40" end="42" type="uint"/> - <field name="Depth Test Function" start="37" end="39" type="uint"/> + <field name="Stencil Test Function" start="40" end="42" type="3D_Compare_Function"/> + <field name="Depth Test Function" start="37" end="39" type="3D_Compare_Function"/> <field name="Double Sided Stencil Enable" start="36" end="36" type="bool"/> <field name="Stencil Test Enable" start="35" end="35" type="bool"/> <field name="Stencil Buffer Write Enable" start="34" end="34" type="bool"/> diff --git a/src/intel/genxml/gen9.xml b/src/intel/genxml/gen9.xml index 3ba1104..3232cf9 100644 --- a/src/intel/genxml/gen9.xml +++ b/src/intel/genxml/gen9.xml @@ -560,7 +560,7 @@ <field name="Alpha To One Enable" start="29" end="29" type="bool"/> <field name="Alpha To Coverage Dither Enable" start="28" end="28" type="bool"/> <field name="Alpha Test Enable" start="27" end="27" type="bool"/> - <field name="Alpha Test Function" start="24" end="26" type="uint"/> + <field name="Alpha Test Function" start="24" end="26" type="3D_Compare_Function"/> <field name="Color Dither Enable" start="23" end="23" type="bool"/> <field name="X Dither Offset" start="21" end="22" type="uint"/> <field name="Y Dither Offset" start="19" end="20" type="uint"/> @@ -2598,12 +2598,12 @@ <field name="Stencil Fail Op" start="61" end="63" type="uint"/> <field name="Stencil Pass Depth Fail Op" start="58" end="60" type="uint"/> <field name="Stencil Pass Depth Pass Op" start="55" end="57" type="uint"/> - <field name="Backface Stencil Test Function" start="52" end="54" type="uint"/> + <field name="Backface Stencil Test Function" start="52" end="54" type="3D_Compare_Function"/> <field name="Backface Stencil Fail Op" start="49" end="51" type="uint"/> <field name="Backface Stencil Pass Depth Fail Op" start="46" end="48" type="uint"/> <field name="Backface Stencil Pass Depth Pass Op" start="43" end="45" type="uint"/> - <field name="Stencil Test Function" start="40" end="42" type="uint"/> - <field name="Depth Test Function" start="37" end="39" type="uint"/> + <field name="Stencil Test Function" start="40" end="42" type="3D_Compare_Function"/> + <field name="Depth Test Function" start="37" end="39" type="3D_Compare_Function"/> <field name="Double Sided Stencil Enable" start="36" end="36" type="bool"/> <field name="Stencil Test Enable" start="35" end="35" type="bool"/> <field name="Stencil Buffer Write Enable" start="34" end="34" type="bool"/> _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
