Mesa (main): microsoft/compiler: harmonize num_psv_inputs with outputs

[GitLab Mirror]

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

Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date:   Wed Aug  4 14:13:15 2021 +0200

microsoft/compiler: harmonize num_psv_inputs with outputs

This doesn't seems to make a practical difference, but it seems better
to do it the same way as we do for outputs, as well as what DXC does.

Reviewed-by: Jesse Natalie <jenatali at microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12197>

---

 src/microsoft/compiler/dxil_signature.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/microsoft/compiler/dxil_signature.c b/src/microsoft/compiler/dxil_signature.c
index 71fca207459..71c9643f9a9 100644
--- a/src/microsoft/compiler/dxil_signature.c
+++ b/src/microsoft/compiler/dxil_signature.c
@@ -482,6 +482,9 @@ get_input_signature_group(struct dxil_module *mod, const struct dxil_mdnode **in
                              &inputs[num_inputs], elm, psv_elm))
          return 0;
 
+      mod->num_psv_inputs = MAX2(mod->num_psv_inputs,
+                                 semantic.start_row + semantic.rows);
+
       ++num_inputs;
       assert(num_inputs < VARYING_SLOT_MAX);
    }
@@ -516,8 +519,6 @@ get_input_signature(struct dxil_module *mod, nir_shader *s, bool vulkan)
    if (!mod->num_sig_inputs && !mod->num_sig_inputs)
       return NULL;
 
-   mod->num_psv_inputs = next_row;
-
    const struct dxil_mdnode *retval = mod->num_sig_inputs ?
          dxil_get_metadata_node(mod, inputs, mod->num_sig_inputs) : NULL;