From fe2f7c06aeb37fafd427b8b236a040b67ae13fd2 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Thu, 4 Aug 2022 12:41:35 +1000 Subject: [PATCH] Revert "nir: Preserve offsets in lower_io_to_scalar_early" This reverts commit 96fa23bca5ac88e0cd2dd0c45fdef71b2afe888d. The correct fix to the problem was a1bc1523408a3, making this change obsolete as the pass skips any vars marked with always_active_io. There was no real advantage to allowing these vars to be split because they can't be removed anyway. Also there is no way to split varying arrays gracefully here due to the xfb layout rules, and this change didn't handle arrays at all. Removing this obsolete code also fixes an assert in the new CTS test KHR-Single-GL45.enhanced_layouts.xfb_all_stages. The test was legally adding xfb offsets to all vertex stages but since we only mark the varyings in the final vertex stage with the always_active_io flag the other stages were correctly lowering to scalars but when an array with an offset hit this code it asserted since it couldn't handle it. Acked-by: Pierre-Eric Pelloux-Prayer Fixes: a1bc1523408a3 ("spirv: mark variables decorated with XfbBuffer as always active") Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/6928 Part-of: (cherry picked from commit 8bffd601ede40f259b3f9239e3d67393e47138e9) --- .pick_status.json | 2 +- src/compiler/nir/nir_lower_io_to_scalar.c | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 291735cf36d..0e2d7aa8297 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -409,7 +409,7 @@ "description": "Revert \"nir: Preserve offsets in lower_io_to_scalar_early\"", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "a1bc1523408a305b14a8c297ea93a28bb12cee5d" }, diff --git a/src/compiler/nir/nir_lower_io_to_scalar.c b/src/compiler/nir/nir_lower_io_to_scalar.c index 25153d39bdb..12c6a7a46f3 100644 --- a/src/compiler/nir/nir_lower_io_to_scalar.c +++ b/src/compiler/nir/nir_lower_io_to_scalar.c @@ -341,10 +341,6 @@ lower_load_to_scalar_early(nir_builder *b, nir_intrinsic_instr *intr, chan_var = nir_variable_clone(var, b->shader); chan_var->data.location_frac = var->data.location_frac + i; chan_var->type = glsl_channel_type(chan_var->type); - if (var->data.explicit_offset) { - unsigned comp_size = glsl_get_bit_size(chan_var->type) / 8; - chan_var->data.offset = var->data.offset + i * comp_size; - } chan_vars[var->data.location_frac + i] = chan_var; @@ -399,10 +395,6 @@ lower_store_output_to_scalar_early(nir_builder *b, nir_intrinsic_instr *intr, chan_var = nir_variable_clone(var, b->shader); chan_var->data.location_frac = var->data.location_frac + i; chan_var->type = glsl_channel_type(chan_var->type); - if (var->data.explicit_offset) { - unsigned comp_size = glsl_get_bit_size(chan_var->type) / 8; - chan_var->data.offset = var->data.offset + i * comp_size; - } chan_vars[var->data.location_frac + i] = chan_var;