genxml: Add APIMODE_D3D missing enum values and improve consistency.

Cc: "12.0" <mesa-stable@lists.freedesktop.org>
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
(cherry picked from commit 6b67270262)
This commit is contained in:
Kenneth Graunke 2016-07-18 13:56:23 -07:00 committed by Emil Velikov
parent 749e4cb96b
commit 629a7b32e0
6 changed files with 8 additions and 3 deletions

View file

@ -787,6 +787,7 @@
<field name="CLIP Enable" start="95" end="95" type="bool"/>
<field name="API Mode" start="94" end="94" type="uint">
<value name="APIMODE_OGL" value="0"/>
<value name="APIMODE_D3D" value="1"/>
</field>
<field name="Viewport XY ClipTest Enable" start="92" end="92" type="bool"/>
<field name="Viewport Z ClipTest Enable" start="91" end="91" type="bool"/>

View file

@ -959,6 +959,7 @@
<field name="Clip Enable" start="95" end="95" type="bool"/>
<field name="API Mode" start="94" end="94" type="uint">
<value name="APIMODE_OGL" value="0"/>
<value name="APIMODE_D3D" value="1"/>
</field>
<field name="Viewport XY ClipTest Enable" start="92" end="92" type="bool"/>
<field name="Viewport Z ClipTest Enable" start="91" end="91" type="bool"/>

View file

@ -1068,6 +1068,7 @@
<field name="Clip Enable" start="95" end="95" type="bool"/>
<field name="API Mode" start="94" end="94" type="uint">
<value name="APIMODE_OGL" value="0"/>
<value name="APIMODE_D3D" value="1"/>
</field>
<field name="Viewport XY ClipTest Enable" start="92" end="92" type="bool"/>
<field name="Viewport Z ClipTest Enable" start="91" end="91" type="bool"/>

View file

@ -1115,7 +1115,8 @@
<field name="User Clip Distance Cull Test Enable Bitmask" start="32" end="39" type="uint"/>
<field name="Clip Enable" start="95" end="95" type="bool"/>
<field name="API Mode" start="94" end="94" type="uint">
<value name="OGL" value="0"/>
<value name="APIMODE_OGL" value="0"/>
<value name="APIMODE_D3D" value="1"/>
</field>
<field name="Viewport XY Clip Test Enable" start="92" end="92" type="bool"/>
<field name="Guardband Clip Test Enable" start="90" end="90" type="bool"/>

View file

@ -1167,7 +1167,8 @@
<field name="User Clip Distance Cull Test Enable Bitmask" start="32" end="39" type="uint"/>
<field name="Clip Enable" start="95" end="95" type="bool"/>
<field name="API Mode" start="94" end="94" type="uint">
<value name="OGL" value="0"/>
<value name="APIMODE_OGL" value="0"/>
<value name="APIMODE_D3D" value="1"/>
</field>
<field name="Viewport XY Clip Test Enable" start="92" end="92" type="bool"/>
<field name="Guardband Clip Test Enable" start="90" end="90" type="bool"/>

View file

@ -190,7 +190,7 @@ genX(graphics_pipeline_create)(
anv_batch_emit(&pipeline->batch, GENX(3DSTATE_CLIP), clip) {
clip.ClipEnable = !(extra && extra->use_rectlist);
clip.EarlyCullEnable = true;
clip.APIMode = 1; /* D3D */
clip.APIMode = APIMODE_D3D;
clip.ViewportXYClipTestEnable = true;
clip.ClipMode =