From 1c8226c6820557451ba060956f27e70ad90d1c9e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alejandro=20Pi=C3=B1eiro?= Date: Wed, 8 Jan 2020 10:56:17 +0100 Subject: [PATCH] v3d/compiler: update uses_vid/uses_iid check In order to take into account the vulkan specific system values SYSTEM_VALUE_INSTANCE_INDEX and SYSTEM_VALUE_VERTEX_ID_ZERO_BASE. Reviewed-by: Iago Toral Reviewed-by: Reviewed-by: Eric Anholt Part-of: --- src/broadcom/compiler/nir_to_vir.c | 6 ++++-- src/broadcom/compiler/vir.c | 7 +++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/broadcom/compiler/nir_to_vir.c b/src/broadcom/compiler/nir_to_vir.c index 65d6d4d..6b55bf7 100644 --- a/src/broadcom/compiler/nir_to_vir.c +++ b/src/broadcom/compiler/nir_to_vir.c @@ -1534,9 +1534,11 @@ ntq_setup_vs_inputs(struct v3d_compile *c) unsigned num_components = 0; uint32_t vpm_components_queued = 0; bool uses_iid = c->s->info.system_values_read & - (1ull << SYSTEM_VALUE_INSTANCE_ID); + (1ull << SYSTEM_VALUE_INSTANCE_ID | + 1ull << SYSTEM_VALUE_INSTANCE_INDEX); bool uses_vid = c->s->info.system_values_read & - (1ull << SYSTEM_VALUE_VERTEX_ID); + (1ull << SYSTEM_VALUE_VERTEX_ID | + 1ull << SYSTEM_VALUE_VERTEX_ID_ZERO_BASE); num_components += uses_iid; num_components += uses_vid; diff --git a/src/broadcom/compiler/vir.c b/src/broadcom/compiler/vir.c index 34f63a5..805f1f3 100644 --- a/src/broadcom/compiler/vir.c +++ b/src/broadcom/compiler/vir.c @@ -625,9 +625,12 @@ v3d_vs_set_prog_data(struct v3d_compile *c, } prog_data->uses_vid = (c->s->info.system_values_read & - (1ull << SYSTEM_VALUE_VERTEX_ID)); + (1ull << SYSTEM_VALUE_VERTEX_ID | + 1ull << SYSTEM_VALUE_VERTEX_ID_ZERO_BASE)); + prog_data->uses_iid = (c->s->info.system_values_read & - (1ull << SYSTEM_VALUE_INSTANCE_ID)); + (1ull << SYSTEM_VALUE_INSTANCE_ID | + 1ull << SYSTEM_VALUE_INSTANCE_INDEX)); if (prog_data->uses_vid) prog_data->vpm_input_size++; -- 2.7.4