Mesa (master): tgsi_to_nir: Restructure system value loads.
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue Mar 5 19:14:04 UTC 2019
Module: Mesa
Branch: master
Commit: 840c7d1ebd08785b7fff5efdfc1a7fb2a8ff94b1
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=840c7d1ebd08785b7fff5efdfc1a7fb2a8ff94b1
Author: Timur Kristóf <timur.kristof at gmail.com>
Date: Fri Feb 8 22:15:56 2019 +0100
tgsi_to_nir: Restructure system value loads.
Minor cleanup to the way system value loads work in tgsi_to_nir.
Signed-Off-By: Timur Kristóf <timur.kristof at gmail.com>
Tested-by: Andre Heider <a.heider at gmail.com>
Tested-by: Rob Clark <robdclark at gmail.com>
Reviewed-by: Timothy Arceri <tarceri at itsqueeze.com>
Reviewed-by: Eric Anholt <eric at anholt.net>
---
src/gallium/auxiliary/nir/tgsi_to_nir.c | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/src/gallium/auxiliary/nir/tgsi_to_nir.c b/src/gallium/auxiliary/nir/tgsi_to_nir.c
index 11c16d43615..67058b398ae 100644
--- a/src/gallium/auxiliary/nir/tgsi_to_nir.c
+++ b/src/gallium/auxiliary/nir/tgsi_to_nir.c
@@ -479,9 +479,8 @@ ttn_src_for_file_and_index(struct ttn_compile *c, unsigned file, unsigned index,
break;
case TGSI_FILE_SYSTEM_VALUE: {
- nir_intrinsic_instr *load;
nir_intrinsic_op op;
- unsigned ncomp = 1;
+ nir_ssa_def *load;
assert(!indirect);
assert(!dim);
@@ -489,28 +488,25 @@ 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;
default:
unreachable("bad system value");
}
- load = nir_intrinsic_instr_create(b->shader, op);
- load->num_components = ncomp;
-
- nir_ssa_dest_init(&load->instr, &load->dest, ncomp, 32, NULL);
- nir_builder_instr_insert(b, &load->instr);
-
- src = nir_src_for_ssa(&load->dest.ssa);
-
+ src = nir_src_for_ssa(load);
b->shader->info.system_values_read |=
(1 << nir_system_value_from_intrinsic(op));
More information about the mesa-commit
mailing list