From 9da442b63acff717c8450ab6e1ce17be5ca18f4c Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Sat, 12 Nov 2016 09:05:59 -0800 Subject: [PATCH] intel/genxml: Make some 3DSTATE_GS fields more consistent Reviewed-by: Timothy Arceri Reviewed-by: Kristian H. Kristensen --- src/intel/genxml/gen6.xml | 4 ++-- src/intel/genxml/gen7.xml | 4 ++-- src/intel/genxml/gen75.xml | 8 ++++---- src/intel/genxml/gen8.xml | 2 +- src/intel/genxml/gen9.xml | 2 +- src/intel/vulkan/gen7_pipeline.c | 6 +++--- src/intel/vulkan/gen8_pipeline.c | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/intel/genxml/gen6.xml b/src/intel/genxml/gen6.xml index 980a74ceaa4..ad130d95738 100644 --- a/src/intel/genxml/gen6.xml +++ b/src/intel/genxml/gen6.xml @@ -1049,7 +1049,7 @@ - + @@ -1057,7 +1057,7 @@ - + diff --git a/src/intel/genxml/gen7.xml b/src/intel/genxml/gen7.xml index ffcf8d48378..9bf38143445 100644 --- a/src/intel/genxml/gen7.xml +++ b/src/intel/genxml/gen7.xml @@ -1195,13 +1195,13 @@ - + - + diff --git a/src/intel/genxml/gen75.xml b/src/intel/genxml/gen75.xml index c4839eba776..280e7c4aba3 100644 --- a/src/intel/genxml/gen75.xml +++ b/src/intel/genxml/gen75.xml @@ -1410,16 +1410,16 @@ - + - - + + - + diff --git a/src/intel/genxml/gen8.xml b/src/intel/genxml/gen8.xml index 73c92651dde..f4dda4e9954 100644 --- a/src/intel/genxml/gen8.xml +++ b/src/intel/genxml/gen8.xml @@ -1446,7 +1446,7 @@ - + diff --git a/src/intel/genxml/gen9.xml b/src/intel/genxml/gen9.xml index 0dfce3fb176..58b41f71dd9 100644 --- a/src/intel/genxml/gen9.xml +++ b/src/intel/genxml/gen9.xml @@ -1548,7 +1548,7 @@ - + diff --git a/src/intel/vulkan/gen7_pipeline.c b/src/intel/vulkan/gen7_pipeline.c index d747c514f85..c965c5f1377 100644 --- a/src/intel/vulkan/gen7_pipeline.c +++ b/src/intel/vulkan/gen7_pipeline.c @@ -142,14 +142,14 @@ genX(graphics_pipeline_create)( gs.ControlDataHeaderSize = gs_prog_data->control_data_header_size_hwords; gs.InstanceControl = MAX2(gs_prog_data->invocations, 1) - 1; gs.DispatchMode = gs_prog_data->base.dispatch_mode; - gs.GSStatisticsEnable = true; + gs.StatisticsEnable = true; gs.IncludePrimitiveID = gs_prog_data->include_primitive_id; # if (GEN_IS_HASWELL) - gs.ReorderMode = REORDER_TRAILING; + gs.ReorderMode = TRAILING; # else gs.ReorderEnable = true; # endif - gs.GSEnable = true; + gs.FunctionEnable = true; } } diff --git a/src/intel/vulkan/gen8_pipeline.c b/src/intel/vulkan/gen8_pipeline.c index 827ee512396..1320a1377af 100644 --- a/src/intel/vulkan/gen8_pipeline.c +++ b/src/intel/vulkan/gen8_pipeline.c @@ -151,7 +151,7 @@ genX(graphics_pipeline_create)( gs.StatisticsEnable = true; gs.IncludePrimitiveID = gs_prog_data->include_primitive_id; gs.ReorderMode = TRAILING; - gs.Enable = true; + gs.FunctionEnable = true; gs.ControlDataFormat = gs_prog_data->control_data_format; -- 2.11.0