From ece206b84864e3727bee2672b838f70f2a3f460c Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Fri, 1 Sep 2017 22:17:50 -0700 Subject: i965/program: Move nir_lower_system_values higher up We want this to get called before nir_lower_subgroups which is going in brw_preprocess_nir. Now that nir_lower_wpos_ytransform can handle system values, this should be safe to do. Reviewed-by: Lionel Landwerlin --- src/mesa/drivers/dri/i965/brw_program.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/mesa') diff --git a/src/mesa/drivers/dri/i965/brw_program.c b/src/mesa/drivers/dri/i965/brw_program.c index 3b54b37cfaa..ebb6998a002 100644 --- a/src/mesa/drivers/dri/i965/brw_program.c +++ b/src/mesa/drivers/dri/i965/brw_program.c @@ -89,6 +89,8 @@ brw_create_nir(struct brw_context *brw, nir = brw_preprocess_nir(brw->screen->compiler, nir); + NIR_PASS_V(nir, nir_lower_system_values); + if (stage == MESA_SHADER_FRAGMENT) { static const struct nir_lower_wpos_ytransform_options wpos_options = { .state_tokens = {STATE_INTERNAL, STATE_FB_WPOS_Y_TRANSFORM, 0, 0, 0}, @@ -104,7 +106,6 @@ brw_create_nir(struct brw_context *brw, } } - NIR_PASS_V(nir, nir_lower_system_values); NIR_PASS_V(nir, brw_nir_lower_uniforms, is_scalar); return nir; -- cgit v1.2.3