diff options
| author | Kenneth Graunke <[email protected]> | 2016-09-07 13:46:57 -0700 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2017-05-03 16:41:07 -0700 |
| commit | da299b7df3682bb7528caee07a56b03bc943a4c3 (patch) | |
| tree | b62d28962b6a88d244f9c3b99f2c71eca66a744f /src | |
| parent | 872ffb22219825dfc898116c1f100dd11a59e7ba (diff) | |
genxml: Make "Reorder Mode" fields consistent.
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 <[email protected]>
Reviewed-by: Rafael Antognolli <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/intel/genxml/gen6.xml | 5 | ||||
| -rw-r--r-- | src/intel/genxml/gen7.xml | 5 | ||||
| -rw-r--r-- | src/intel/vulkan/genX_pipeline.c | 4 |
3 files changed, 8 insertions, 6 deletions
diff --git a/src/intel/genxml/gen6.xml b/src/intel/genxml/gen6.xml index 8ead41f2bcd..14d643c9ca0 100644 --- a/src/intel/genxml/gen6.xml +++ b/src/intel/genxml/gen6.xml @@ -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"/> diff --git a/src/intel/genxml/gen7.xml b/src/intel/genxml/gen7.xml index b63add0e1a0..e6b61b75852 100644 --- a/src/intel/genxml/gen7.xml +++ b/src/intel/genxml/gen7.xml @@ -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"/> diff --git a/src/intel/vulkan/genX_pipeline.c b/src/intel/vulkan/genX_pipeline.c index 6068a431086..2961d95b6b0 100644 --- a/src/intel/vulkan/genX_pipeline.c +++ b/src/intel/vulkan/genX_pipeline.c @@ -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; |