OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iris: Set nir_shader_compiler_options::unify_interfaces.

Browse Source 
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@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>
This commit is contained in:
Kenneth Graunke
2019-06-17 17:12:25 -05:00
parent 19ed12afd1
commit d0d28c783d
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/drivers/iris/iris_program.c
View File

@@ -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. * Undo nir_lower_passthrough_edgeflags but keep the inputs_read flag.
*/ */

3
src/intel/compiler/brw_compiler.c
View File

@@ -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_int64_options = int64_options;
nir_options->lower_doubles_options = fp64_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].NirOptions = nir_options;
compiler->glsl_compiler_options[i].ClampBlockIndicesToArrayBounds = true; compiler->glsl_compiler_options[i].ClampBlockIndicesToArrayBounds = true;