OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

genxml: Add CLIPMODE_* prefix to 3DSTATE_CLIP's "Clip Mode" enum values.

Browse Source 
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" <mesa-stable@lists.freedesktop.org>
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Kenneth Graunke
2016-07-18 15:36:43 -07:00
parent 0f13a8f770
commit c31cf532af
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/intel/genxml/gen8.xml
View File

@@ -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"/>

6
src/intel/genxml/gen9.xml
View File

@@ -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"/>

2
src/intel/vulkan/gen8_pipeline.c
View File

@@ -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;