Mesa (master): i965: allow sampler indirects on all gens

[Timothy Arceri]

Module: Mesa
Branch: master
Commit: 976859ce57bb3d233d23019fb9123ca4e80ca7e5
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=976859ce57bb3d233d23019fb9123ca4e80ca7e5

Author: Timothy Arceri <timothy.arceri at collabora.com>
Date:   Fri Sep 16 22:36:30 2016 +1000

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 <jason at jlekstrand.net>

---

 src/mesa/drivers/dri/i965/brw_compiler.c | 4 ----
 1 file changed, 4 deletions(-)

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 {