From 4e47c205b9749aebb258075da36d176e1d453eb4 Mon Sep 17 00:00:00 2001 From: Rob Clark Date: Wed, 4 Dec 2019 10:15:39 -0800 Subject: [PATCH] freedreno/ir3: remove store_output lowered to store_shared_ir3 Fixes crashes that were unnoticed in CI because debug_assert() was not enabled (but become real crashes after the next patch): dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.ivec2_highp_geometry dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.ivec2_lowp_geometry dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.ivec2_mediump_geometry dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.uvec2_highp_geometry dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.uvec2_lowp_geometry dEQP-GLES31.functional.shaders.builtin_functions.integer.bitfieldextract.uvec2_mediump_geometry Signed-off-by: Rob Clark Reviewed-by: Kristian H. Kristensen --- src/freedreno/ir3/ir3_nir_lower_tess.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/freedreno/ir3/ir3_nir_lower_tess.c b/src/freedreno/ir3/ir3_nir_lower_tess.c index 27fc24c1a0d..5066f022729 100644 --- a/src/freedreno/ir3/ir3_nir_lower_tess.c +++ b/src/freedreno/ir3/ir3_nir_lower_tess.c @@ -191,7 +191,7 @@ lower_vs_block(nir_block *block, nir_builder *b, struct state *state) case nir_intrinsic_store_output: { // src[] = { value, offset }. - b->cursor = nir_before_instr(&intr->instr); + b->cursor = nir_instr_remove(&intr->instr); nir_ssa_def *vertex_id = build_vertex_id(b, state); nir_ssa_def *offset = build_local_offset(b, state, vertex_id, nir_intrinsic_base(intr), -- 2.30.2