Gen6-7.5 use CLIPMODE_REJECT_ALL, while Gen8+ just used REJECT_ALL. Being consistent will let me unify code, and I prefer having the prefix.
Signed-off-by: Kenneth Graunke <kenn...@whitecape.org> --- src/intel/genxml/gen8.xml | 6 +++--- src/intel/genxml/gen9.xml | 6 +++--- src/intel/vulkan/gen8_pipeline.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/intel/genxml/gen8.xml b/src/intel/genxml/gen8.xml index 97af191..386e8fc 100644 --- a/src/intel/genxml/gen8.xml +++ b/src/intel/genxml/gen8.xml @@ -1121,9 +1121,9 @@ <field name="Guardband Clip Test Enable" start="90" end="90" type="bool"/> <field name="User Clip Distance Clip Test Enable Bitmask" start="80" end="87" type="uint"/> <field name="Clip Mode" start="77" end="79" type="uint"> - <value name="NORMAL" value="0"/> - <value name="REJECT_ALL" value="3"/> - <value name="ACCEPT_ALL" value="4"/> + <value name="CLIPMODE_NORMAL" value="0"/> + <value name="CLIPMODE_REJECT_ALL" value="3"/> + <value name="CLIPMODE_ACCEPT_ALL" value="4"/> </field> <field name="Perspective Divide Disable" start="73" end="73" type="bool"/> <field name="Non-Perspective Barycentric Enable" start="72" end="72" type="bool"/> diff --git a/src/intel/genxml/gen9.xml b/src/intel/genxml/gen9.xml index 5e3e2e1..896143b 100644 --- a/src/intel/genxml/gen9.xml +++ b/src/intel/genxml/gen9.xml @@ -1173,9 +1173,9 @@ <field name="Guardband Clip Test Enable" start="90" end="90" type="bool"/> <field name="User Clip Distance Clip Test Enable Bitmask" start="80" end="87" type="uint"/> <field name="Clip Mode" start="77" end="79" type="uint"> - <value name="NORMAL" value="0"/> - <value name="REJECT_ALL" value="3"/> - <value name="ACCEPT_ALL" value="4"/> + <value name="CLIPMODE_NORMAL" value="0"/> + <value name="CLIPMODE_REJECT_ALL" value="3"/> + <value name="CLIPMODE_ACCEPT_ALL" value="4"/> </field> <field name="Perspective Divide Disable" start="73" end="73" type="bool"/> <field name="Non-Perspective Barycentric Enable" start="72" end="72" type="bool"/> diff --git a/src/intel/vulkan/gen8_pipeline.c b/src/intel/vulkan/gen8_pipeline.c index 4908bbd..4e04aad 100644 --- a/src/intel/vulkan/gen8_pipeline.c +++ b/src/intel/vulkan/gen8_pipeline.c @@ -195,7 +195,7 @@ genX(graphics_pipeline_create)( clip.ClipMode = pCreateInfo->pRasterizationState->rasterizerDiscardEnable ? - REJECT_ALL : NORMAL; + CLIPMODE_REJECT_ALL : CLIPMODE_NORMAL; clip.NonPerspectiveBarycentricEnable = wm_prog_data ? (wm_prog_data->barycentric_interp_modes & 0x38) != 0 : 0; -- 2.9.0 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev