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

genxml: Make "Reorder Mode" fields consistent.

Browse Source 
Both GS and SOL have these fields.  Some were ReorderEnable = true,
some were ReorderMode = REORDER_TRAILING, and some were just TRAILING.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Rafael Antognolli <rafael.antognolli@intel.com>
This commit is contained in:
Kenneth Graunke
2016-09-07 13:46:57 -07:00
parent 872ffb2221
commit da299b7df3
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/intel/genxml/gen6.xml
View File

@@ -1006,7 +1006,10 @@
<field name="Statistics Enable" start="170" end="170" type="bool"/>
<field name="SO Statistics Enable" start="169" end="169" type="bool"/>
<field name="Rendering Enabled" start="168" end="168" type="uint"/>
<field name="Reorder Enable" start="222" end="222" type="bool"/>
<field name="Reorder Mode" start="222" end="222" type="uint">
<value name="LEADING" value="0"/>
<value name="TRAILING" value="1"/>
</field>
<field name="Discard Adjacency" start="221" end="221" type="bool"/>
<field name="SVBI Payload Enable" start="220" end="220" type="bool"/>
<field name="SVBI Post-Increment Enable" start="219" end="219" type="bool"/>

5
src/intel/genxml/gen7.xml
View File

@@ -1157,7 +1157,10 @@
<field name="GS Invocations Increment Value" start="165" end="169" type="uint"/>
<field name="Include Primitive ID" start="164" end="164" type="bool"/>
<field name="Hint" start="163" end="163" type="uint"/>
<field name="Reorder Enable" start="162" end="162" type="bool"/>
<field name="Reorder Mode" start="162" end="162" type="uint">
<value name="LEADING" value="0"/>
<value name="TRAILING" value="1"/>
</field>
<field name="Discard Adjacency" start="161" end="161" type="bool"/>
<field name="Function Enable" start="160" end="160" type="bool"/>
<field name="Semaphore Handle" start="192" end="203" type="offset"/>

4
src/intel/vulkan/genX_pipeline.c
View File

@@ -1303,11 +1303,7 @@ emit_3dstate_gs(struct anv_pipeline *pipeline)
gs.ControlDataFormat = gs_prog_data->control_data_format;
gs.ControlDataHeaderSize = gs_prog_data->control_data_header_size_hwords;
gs.InstanceControl = MAX2(gs_prog_data->invocations, 1) - 1;
#if GEN_GEN >= 8 || GEN_IS_HASWELL
gs.ReorderMode = TRAILING;
#else
gs.ReorderEnable = true;
#endif
#if GEN_GEN >= 8
gs.ExpectedVertexCount = gs_prog_data->vertices_in;