From 7ca8c19246ebe08aeeb0a8621d51d9cb04178495 Mon Sep 17 00:00:00 2001 From: Caterina Shablia Date: Fri, 22 Nov 2024 16:53:30 +0000 Subject: [PATCH] Revert "nir: introduce instance_index system value" This reverts commit b9be1f1f20d42d736f64ce95fc9240483958e1fd. Reviewed-by: Alyssa Rosenzweig Part-of: --- src/compiler/nir/nir_divergence_analysis.c | 1 - src/compiler/nir/nir_gather_info.c | 1 - src/compiler/nir/nir_intrinsics.py | 1 - src/compiler/nir/nir_opt_peephole_select.c | 1 - 4 files changed, 4 deletions(-) diff --git a/src/compiler/nir/nir_divergence_analysis.c b/src/compiler/nir/nir_divergence_analysis.c index d40486c724b..a8fc33bc98e 100644 --- a/src/compiler/nir/nir_divergence_analysis.c +++ b/src/compiler/nir/nir_divergence_analysis.c @@ -452,7 +452,6 @@ visit_intrinsic(nir_intrinsic_instr *instr, struct divergence_state *state) is_divergent |= !(options & nir_divergence_single_prim_per_subgroup); break; case nir_intrinsic_load_instance_id: - case nir_intrinsic_load_instance_index: is_divergent = !state->vertex_divergence; break; case nir_intrinsic_load_primitive_id: diff --git a/src/compiler/nir/nir_gather_info.c b/src/compiler/nir/nir_gather_info.c index 301b06889d0..a8621ab4a3f 100644 --- a/src/compiler/nir/nir_gather_info.c +++ b/src/compiler/nir/nir_gather_info.c @@ -658,7 +658,6 @@ gather_intrinsic_info(nir_intrinsic_instr *instr, nir_shader *shader, case nir_intrinsic_load_subgroup_id: case nir_intrinsic_load_vertex_id: case nir_intrinsic_load_instance_id: - case nir_intrinsic_load_instance_index: case nir_intrinsic_load_vertex_id_zero_base: case nir_intrinsic_load_base_vertex: case nir_intrinsic_load_first_vertex: diff --git a/src/compiler/nir/nir_intrinsics.py b/src/compiler/nir/nir_intrinsics.py index c668e17f6f4..06fa6ecceef 100644 --- a/src/compiler/nir/nir_intrinsics.py +++ b/src/compiler/nir/nir_intrinsics.py @@ -891,7 +891,6 @@ system_value("first_vertex", 1) system_value("is_indexed_draw", 1) system_value("base_vertex", 1) system_value("instance_id", 1) -system_value("instance_index", 1) system_value("base_instance", 1) system_value("draw_id", 1) system_value("sample_id", 1) diff --git a/src/compiler/nir/nir_opt_peephole_select.c b/src/compiler/nir/nir_opt_peephole_select.c index 946835c1beb..202f84a18ff 100644 --- a/src/compiler/nir/nir_opt_peephole_select.c +++ b/src/compiler/nir/nir_opt_peephole_select.c @@ -166,7 +166,6 @@ block_check_for_allowed_instrs(nir_block *block, unsigned *count, case nir_intrinsic_load_first_vertex: case nir_intrinsic_load_base_instance: case nir_intrinsic_load_instance_id: - case nir_intrinsic_load_instance_index: case nir_intrinsic_load_draw_id: case nir_intrinsic_load_num_workgroups: case nir_intrinsic_load_workgroup_id: