From b48188e46c84d103aacb365a27bf914789b03344 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Tue, 28 Feb 2023 19:56:55 -0500 Subject: [PATCH] st/mesa: lower sysvals slightly sooner This will make a later commit simpler. No change in behavior. Acked-by: Pierre-Eric Pelloux-Prayer Reviewed-by: Alyssa Rosenzweig Part-of: --- src/mesa/state_tracker/st_glsl_to_nir.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/mesa/state_tracker/st_glsl_to_nir.cpp b/src/mesa/state_tracker/st_glsl_to_nir.cpp index 5211c12c296..b06f6d09aac 100644 --- a/src/mesa/state_tracker/st_glsl_to_nir.cpp +++ b/src/mesa/state_tracker/st_glsl_to_nir.cpp @@ -616,6 +616,12 @@ st_link_glsl_to_nir(struct gl_context *ctx, * constants in GLSL. */ NIR_PASS(_, nir, gl_nir_lower_buffers, shader_program); + NIR_PASS(_, nir, st_nir_lower_wpos_ytransform, shader->Program, + st->screen); + + NIR_PASS(_, nir, nir_lower_system_values); + NIR_PASS(_, nir, nir_lower_compute_system_values, NULL); + /* Remap the locations to slots so those requiring two slots will occupy * two locations. For instance, if we have in the IR code a dvec3 attr0 in * location 0 and vec4 attr1 in location 1, in NIR attr0 will use @@ -624,12 +630,6 @@ st_link_glsl_to_nir(struct gl_context *ctx, if (nir->info.stage == MESA_SHADER_VERTEX && !shader_program->data->spirv) nir_remap_dual_slot_attributes(nir, &shader->Program->DualSlotInputs); - NIR_PASS(_, nir, st_nir_lower_wpos_ytransform, shader->Program, - st->screen); - - NIR_PASS(_, nir, nir_lower_system_values); - NIR_PASS(_, nir, nir_lower_compute_system_values, NULL); - if (i >= 1) { struct gl_program *prev_shader = linked_shader[i - 1]->Program;