Mesa (master): iris: Set nir_shader_compiler_options::unify_interfaces.

[GitLab Mirror]

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

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Mon Jun 17 17:12:25 2019 -0500

iris: Set nir_shader_compiler_options::unify_interfaces.

This is technically enabling the option in the common intel backend
code, but only the st/nir linker uses the option, so it's iris-only.

Fixes Piglit's spec/glsl-1.50/execution/geometry/clip-distance-vs-gs-out

Closes: #2274
Reviewed-by: Timothy Arceri <tarceri at itsqueeze.com>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3249>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3249>

---

 src/gallium/drivers/iris/iris_program.c | 2 --
 src/intel/compiler/brw_compiler.c       | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/iris/iris_program.c b/src/gallium/drivers/iris/iris_program.c
index c162141a9f9..20dba6ea383 100644
--- a/src/gallium/drivers/iris/iris_program.c
+++ b/src/gallium/drivers/iris/iris_program.c
@@ -261,8 +261,6 @@ iris_lower_storage_image_derefs(nir_shader *nir)
    }
 }
 
-// XXX: need unify_interfaces() at link time...
-
 /**
  * Undo nir_lower_passthrough_edgeflags but keep the inputs_read flag.
  */
diff --git a/src/intel/compiler/brw_compiler.c b/src/intel/compiler/brw_compiler.c
index 06b70193dd6..0a4140eda43 100644
--- a/src/intel/compiler/brw_compiler.c
+++ b/src/intel/compiler/brw_compiler.c
@@ -194,6 +194,9 @@ brw_compiler_create(void *mem_ctx, const struct gen_device_info *devinfo)
 
       nir_options->lower_int64_options = int64_options;
       nir_options->lower_doubles_options = fp64_options;
+
+      nir_options->unify_interfaces = i < MESA_SHADER_FRAGMENT;
+
       compiler->glsl_compiler_options[i].NirOptions = nir_options;
 
       compiler->glsl_compiler_options[i].ClampBlockIndicesToArrayBounds = true;