From 6b6a8a99f8ef5fbc7df19dafa574c49720245607 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Mon, 25 Jan 2016 15:52:53 -0800 Subject: [PATCH] HACK/i965: Default to scalar GS on BDW+ --- src/mesa/drivers/dri/i965/brw_compiler.c | 2 +- src/vulkan/anv_device.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_compiler.c b/src/mesa/drivers/dri/i965/brw_compiler.c index f9e22d1d6b5..682e61b7d63 100644 --- a/src/mesa/drivers/dri/i965/brw_compiler.c +++ b/src/mesa/drivers/dri/i965/brw_compiler.c @@ -133,7 +133,7 @@ brw_compiler_create(void *mem_ctx, const struct brw_device_info *devinfo) compiler->scalar_stage[MESA_SHADER_TESS_EVAL] = devinfo->gen >= 8 && env_var_as_boolean("INTEL_SCALAR_TES", true); compiler->scalar_stage[MESA_SHADER_GEOMETRY] = - devinfo->gen >= 8 && env_var_as_boolean("INTEL_SCALAR_GS", false); + devinfo->gen >= 8 && env_var_as_boolean("INTEL_SCALAR_GS", true); compiler->scalar_stage[MESA_SHADER_FRAGMENT] = true; compiler->scalar_stage[MESA_SHADER_COMPUTE] = true; diff --git a/src/vulkan/anv_device.c b/src/vulkan/anv_device.c index ed9bb0852c8..f9aa3149207 100644 --- a/src/vulkan/anv_device.c +++ b/src/vulkan/anv_device.c @@ -138,10 +138,6 @@ anv_physical_device_init(struct anv_physical_device *device, device->compiler->shader_debug_log = compiler_debug_log; device->compiler->shader_perf_log = compiler_perf_log; - /* Default to use scalar GS on BDW+ */ - device->compiler->scalar_stage[MESA_SHADER_GEOMETRY] = - device->info->gen >= 8 && env_var_as_boolean("INTEL_SCALAR_GS", true); - /* XXX: Actually detect bit6 swizzling */ isl_device_init(&device->isl_dev, device->info, swizzled); -- 2.30.2