From 71c0dcf26621f0403586a1b09df7e7cecb063979 Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Wed, 2 Oct 2019 16:30:45 -0400 Subject: nir: support feeding state to nir_lower_clip_[vg]s MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Marek Olšák --- src/gallium/drivers/iris/iris_program.c | 7 ++++--- src/gallium/drivers/vc4/vc4_program.c | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'src/gallium/drivers') diff --git a/src/gallium/drivers/iris/iris_program.c b/src/gallium/drivers/iris/iris_program.c index fc4f2d2949d..6f2b320bb44 100644 --- a/src/gallium/drivers/iris/iris_program.c +++ b/src/gallium/drivers/iris/iris_program.c @@ -939,7 +939,7 @@ iris_compile_vs(struct iris_context *ice, if (key->nr_userclip_plane_consts) { nir_function_impl *impl = nir_shader_get_entrypoint(nir); nir_lower_clip_vs(nir, (1 << key->nr_userclip_plane_consts) - 1, true, - false); + false, NULL); nir_lower_io_to_temporaries(nir, impl, true, false); nir_lower_global_vars_to_local(nir); nir_lower_vars_to_ssa(nir); @@ -1283,7 +1283,7 @@ iris_compile_tes(struct iris_context *ice, if (key->nr_userclip_plane_consts) { nir_function_impl *impl = nir_shader_get_entrypoint(nir); nir_lower_clip_vs(nir, (1 << key->nr_userclip_plane_consts) - 1, true, - false); + false, NULL); nir_lower_io_to_temporaries(nir, impl, true, false); nir_lower_global_vars_to_local(nir); nir_lower_vars_to_ssa(nir); @@ -1403,7 +1403,8 @@ iris_compile_gs(struct iris_context *ice, if (key->nr_userclip_plane_consts) { nir_function_impl *impl = nir_shader_get_entrypoint(nir); - nir_lower_clip_gs(nir, (1 << key->nr_userclip_plane_consts) - 1, false); + nir_lower_clip_gs(nir, (1 << key->nr_userclip_plane_consts) - 1, false, + NULL); nir_lower_io_to_temporaries(nir, impl, true, false); nir_lower_global_vars_to_local(nir); nir_lower_vars_to_ssa(nir); diff --git a/src/gallium/drivers/vc4/vc4_program.c b/src/gallium/drivers/vc4/vc4_program.c index 4568100c104..11133ce2bf8 100644 --- a/src/gallium/drivers/vc4/vc4_program.c +++ b/src/gallium/drivers/vc4/vc4_program.c @@ -2317,7 +2317,7 @@ vc4_shader_ntq(struct vc4_context *vc4, enum qstage stage, c->key->ucp_enables, false); } else { NIR_PASS_V(c->s, nir_lower_clip_vs, - c->key->ucp_enables, false, false); + c->key->ucp_enables, false, false, NULL); NIR_PASS_V(c->s, nir_lower_io_to_scalar, nir_var_shader_out); } -- cgit v1.2.3