From da299b7df3682bb7528caee07a56b03bc943a4c3 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Wed, 7 Sep 2016 13:46:57 -0700 Subject: [PATCH] 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 Reviewed-by: Rafael Antognolli --- src/intel/genxml/gen6.xml | 5 ++++- src/intel/genxml/gen7.xml | 5 ++++- 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 8ead41f..14d643c 100644 --- a/src/intel/genxml/gen6.xml +++ b/src/intel/genxml/gen6.xml @@ -1006,7 +1006,10 @@ - + + + + diff --git a/src/intel/genxml/gen7.xml b/src/intel/genxml/gen7.xml index b63add0..e6b61b7 100644 --- a/src/intel/genxml/gen7.xml +++ b/src/intel/genxml/gen7.xml @@ -1157,7 +1157,10 @@ - + + + + diff --git a/src/intel/vulkan/genX_pipeline.c b/src/intel/vulkan/genX_pipeline.c index 6068a43..2961d95 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; -- 2.7.4