[PATCH 05/13] vkd3d-shader/spirv: Use the register index count in I/O registers in vkd3d_symbol_make_register().

[Conor McCarthy]

From: Conor McCarthy

---
 libs/vkd3d-shader/spirv.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c
index 1c2a9190..b38896ae 100644
--- a/libs/vkd3d-shader/spirv.c
+++ b/libs/vkd3d-shader/spirv.c
@@ -2060,11 +2060,8 @@ static void vkd3d_symbol_make_register(struct vkd3d_symbol *symbol,
     if (vkd3d_shader_register_is_input(reg) || vkd3d_shader_register_is_output(reg)
             || vkd3d_shader_register_is_patch_constant(reg))
     {
-        unsigned int i;
-        for (i = 2; i > 0; --i)
-            if (reg->idx[i].offset != ~0u)
-                break;
-        symbol->key.reg.idx = reg->idx[i].offset;
+        symbol->key.reg.idx = reg->idx_count ? reg->idx[reg->idx_count - 1].offset : ~0u;
+        assert(!reg->idx_count || symbol->key.reg.idx != ~0u);
     }
     else if (reg->type != VKD3DSPR_IMMCONSTBUFFER)
         symbol->key.reg.idx = reg->idx[0].offset;