Mesa (main): ttn: Stop manually managing system_values_read

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: c9bbf751950490e233c669edba4797e3bc6c4322
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c9bbf751950490e233c669edba4797e3bc6c4322

Author: Jason Ekstrand <jason at jlekstrand.net>
Date:   Mon Jun  7 12:09:15 2021 -0500

ttn: Stop manually managing system_values_read

There's no point in duplicating all the ops here.  The caller should run
nir_gather_info if they want system_values_read.  Hand-rolling it all in
tgsi_to_nir is just asking for bugs.

Reviewed-by: Emma Anholt <emma at anholt.net>
Reviewed-by: Timur Kristóf <timur.kristof at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11222>

---

 src/gallium/auxiliary/nir/tgsi_to_nir.c | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/src/gallium/auxiliary/nir/tgsi_to_nir.c b/src/gallium/auxiliary/nir/tgsi_to_nir.c
index 18100e73f6e..6befc4d3e9b 100644
--- a/src/gallium/auxiliary/nir/tgsi_to_nir.c
+++ b/src/gallium/auxiliary/nir/tgsi_to_nir.c
@@ -586,7 +586,6 @@ ttn_src_for_file_and_index(struct ttn_compile *c, unsigned file, unsigned index,
       break;
 
    case TGSI_FILE_SYSTEM_VALUE: {
-      nir_intrinsic_op op;
       nir_ssa_def *load;
 
       assert(!indirect);
@@ -594,62 +593,48 @@ ttn_src_for_file_and_index(struct ttn_compile *c, unsigned file, unsigned index,
 
       switch (c->scan->system_value_semantic_name[index]) {
       case TGSI_SEMANTIC_VERTEXID_NOBASE:
-         op = nir_intrinsic_load_vertex_id_zero_base;
          load = nir_load_vertex_id_zero_base(b);
          break;
       case TGSI_SEMANTIC_VERTEXID:
-         op = nir_intrinsic_load_vertex_id;
          load = nir_load_vertex_id(b);
          break;
       case TGSI_SEMANTIC_BASEVERTEX:
-         op = nir_intrinsic_load_base_vertex;
          load = nir_load_base_vertex(b);
          break;
       case TGSI_SEMANTIC_INSTANCEID:
-         op = nir_intrinsic_load_instance_id;
          load = nir_load_instance_id(b);
          break;
       case TGSI_SEMANTIC_FACE:
          assert(c->cap_face_is_sysval);
-         op = nir_intrinsic_load_front_face;
          load = ttn_emulate_tgsi_front_face(c);
          break;
       case TGSI_SEMANTIC_POSITION:
          assert(c->cap_position_is_sysval);
-         op = nir_intrinsic_load_frag_coord;
          load = nir_load_frag_coord(b);
          break;
       case TGSI_SEMANTIC_PCOORD:
          assert(c->cap_point_is_sysval);
-         op = nir_intrinsic_load_point_coord;
          load = nir_load_point_coord(b);
          break;
       case TGSI_SEMANTIC_THREAD_ID:
-         op = nir_intrinsic_load_local_invocation_id;
          load = nir_load_local_invocation_id(b);
          break;
       case TGSI_SEMANTIC_BLOCK_ID:
-         op = nir_intrinsic_load_work_group_id;
          load = nir_load_work_group_id(b, 32);
          break;
       case TGSI_SEMANTIC_BLOCK_SIZE:
-         op = nir_intrinsic_load_local_group_size;
          load = nir_load_local_group_size(b);
          break;
       case TGSI_SEMANTIC_CS_USER_DATA_AMD:
-         op = nir_intrinsic_load_user_data_amd;
          load = nir_load_user_data_amd(b);
          break;
       case TGSI_SEMANTIC_TESS_DEFAULT_INNER_LEVEL:
-         op = nir_intrinsic_load_tess_level_inner_default;
          load = nir_load_tess_level_inner_default(b);
          break;
       case TGSI_SEMANTIC_TESS_DEFAULT_OUTER_LEVEL:
-         op = nir_intrinsic_load_tess_level_outer_default;
          load = nir_load_tess_level_outer_default(b);
          break;
       case TGSI_SEMANTIC_SAMPLEID:
-         op = nir_intrinsic_load_sample_id;
          load = nir_load_sample_id(b);
          break;
       default:
@@ -662,9 +647,6 @@ ttn_src_for_file_and_index(struct ttn_compile *c, unsigned file, unsigned index,
          load = nir_swizzle(b, load, SWIZ(X, Y, Z, Z), 4);
 
       src = nir_src_for_ssa(load);
-      BITSET_SET(b->shader->info.system_values_read,
-                 nir_system_value_from_intrinsic(op));
-
       break;
    }