diff options
| author | Kenneth Graunke <[email protected]> | 2016-07-18 15:36:43 -0700 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2016-07-20 10:59:44 -0700 |
| commit | c31cf532af4c14ffb82ccbec2e69df82d56c4ef2 (patch) | |
| tree | 878e4c856857f0f47fb939473669db6a0216f3a0 | |
| parent | 0f13a8f770ff27f2fbff2b2fc65752b5f4434d4a (diff) | |
genxml: Add CLIPMODE_* prefix to 3DSTATE_CLIP's "Clip Mode" enum values.
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.
Cc: "12.0" <[email protected]>
Signed-off-by: Kenneth Graunke <[email protected]>
Reviewed-by: Jason Ekstrand <[email protected]>
| -rw-r--r-- | src/intel/genxml/gen8.xml | 6 | ||||
| -rw-r--r-- | src/intel/genxml/gen9.xml | 6 | ||||
| -rw-r--r-- | 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 97af1913aca..386e8fce875 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 5e3e2e13274..896143b2f64 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 4908bbd796d..4e04aadfe89 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; |