From: Timothy Arceri Date: Fri, 16 Sep 2016 12:36:30 +0000 (+1000) Subject: i965: allow sampler indirects on all gens X-Git-Tag: upstream/17.1.0~3688 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=976859ce57bb3d233d23019fb9123ca4e80ca7e5;p=platform%2Fupstream%2Fmesa.git i965: allow sampler indirects on all gens Without this we will regress the max-samplers piglit test on Gen6 and lower when loop unrolling is done in NIR. There is a check in the GLSL IR linker that errors when it finds indirects and EmitNoIndirectSampler is set. As far as I can tell there is no reason for not enabling this for all gens regardless of whether they fully support ARB_gpu_shader5 or not. Reviewed-by: Jason Ekstrand --- diff --git a/src/mesa/drivers/dri/i965/brw_compiler.c b/src/mesa/drivers/dri/i965/brw_compiler.c index 1aa72bc..6a73719 100644 --- a/src/mesa/drivers/dri/i965/brw_compiler.c +++ b/src/mesa/drivers/dri/i965/brw_compiler.c @@ -133,10 +133,6 @@ brw_compiler_create(void *mem_ctx, const struct gen_device_info *devinfo) compiler->glsl_compiler_options[i].EmitNoIndirectTemp = is_scalar; compiler->glsl_compiler_options[i].OptimizeForAOS = !is_scalar; - /* !ARB_gpu_shader5 */ - if (devinfo->gen < 7) - compiler->glsl_compiler_options[i].EmitNoIndirectSampler = true; - if (is_scalar) { compiler->glsl_compiler_options[i].NirOptions = &scalar_nir_options; } else {