[PATCH vkd3d v2 2/2] vkd3d-shader: Trace descriptor register ranges.

[Conor McCarthy]

Signed-off-by: Conor McCarthy <cmccarthy at codeweavers.com>
---
 libs/vkd3d-shader/trace.c | 51 +++++++++++++++++++++++++++------------
 1 file changed, 36 insertions(+), 15 deletions(-)

diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c
index 79a60897..bb347a94 100644
--- a/libs/vkd3d-shader/trace.c
+++ b/libs/vkd3d-shader/trace.c
@@ -762,7 +762,18 @@ static void shader_print_subscript(struct vkd3d_d3d_asm_compiler *compiler,
     shader_print_uint_literal(compiler, "", offset, "]");
 }
 
-static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const struct vkd3d_shader_register *reg)
+static void shader_print_subscript_range(struct vkd3d_d3d_asm_compiler *compiler,
+        unsigned int offset_first, unsigned int offset_last)
+{
+    shader_print_uint_literal(compiler, "[", offset_first, ":");
+    if (offset_last != ~0u)
+        shader_print_uint_literal(compiler, "", offset_last, "]");
+    else
+        vkd3d_string_buffer_printf(&compiler->buffer, "*]");
+}
+
+static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const struct vkd3d_shader_register *reg,
+        bool is_declaration)
 {
     struct vkd3d_string_buffer *buffer = &compiler->buffer;
     unsigned int offset = reg->idx[0].offset;
@@ -1049,6 +1060,8 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const
     {
         if (offset != ~0u)
         {
+            bool is_sm_5_1 = shader_ver_ge(&compiler->shader_version, 5, 1);
+
             if (reg->idx[0].rel_addr || reg->type == VKD3DSPR_IMMCONSTBUFFER
                     || reg->type == VKD3DSPR_INCONTROLPOINT || (reg->type == VKD3DSPR_INPUT
                     && (compiler->shader_version.type == VKD3D_SHADER_TYPE_GEOMETRY
@@ -1062,15 +1075,23 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const
                 vkd3d_string_buffer_printf(buffer, "%u%s", offset, compiler->colours.reset);
             }
 
-            /* For descriptors in sm < 5.1 we move the reg->idx values up one slot
-             * to normalise with 5.1.
-             * Here we should ignore it if it's a descriptor in sm < 5.1. */
-            if (reg->idx[1].offset != ~0u &&
-                    (!is_descriptor || shader_ver_ge(&compiler->shader_version, 5, 1)))
-                shader_print_subscript(compiler, reg->idx[1].offset, reg->idx[1].rel_addr);
-
-            if (reg->idx[2].offset != ~0u)
-                shader_print_subscript(compiler, reg->idx[2].offset, reg->idx[2].rel_addr);
+            /* For sm 5.1 descriptor declarations we need to print the register range instead of
+             * a single register index. */
+            if (is_descriptor && is_declaration && is_sm_5_1)
+            {
+                shader_print_subscript_range(compiler, reg->idx[1].offset, reg->idx[2].offset);
+            }
+            else
+            {
+                /* For descriptors in sm < 5.1 we move the reg->idx values up one slot
+                 * to normalise with 5.1.
+                 * Here we should ignore it if it's a descriptor in sm < 5.1. */
+                if (reg->idx[1].offset != ~0u && (!is_descriptor || is_sm_5_1))
+                    shader_print_subscript(compiler, reg->idx[1].offset, reg->idx[1].rel_addr);
+
+                if (reg->idx[2].offset != ~0u)
+                    shader_print_subscript(compiler, reg->idx[2].offset, reg->idx[2].rel_addr);
+            }
         }
         else
         {
@@ -1092,7 +1113,7 @@ static void shader_dump_dst_param(struct vkd3d_d3d_asm_compiler *compiler,
     struct vkd3d_string_buffer *buffer = &compiler->buffer;
     uint32_t write_mask = param->write_mask;
 
-    shader_dump_register(compiler, &param->reg);
+    shader_dump_register(compiler, &param->reg, true);
 
     if (write_mask)
     {
@@ -1132,7 +1153,7 @@ static void shader_dump_src_param(struct vkd3d_d3d_asm_compiler *compiler,
     if (src_modifier == VKD3DSPSM_ABS || src_modifier == VKD3DSPSM_ABSNEG)
         shader_addline(buffer, "|");
 
-    shader_dump_register(compiler, &param->reg);
+    shader_dump_register(compiler, &param->reg, false);
 
     switch (src_modifier)
     {
@@ -1432,13 +1453,13 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler,
             shader_dump_decl_usage(compiler, &ins->declaration.semantic, ins->flags);
             shader_dump_ins_modifiers(compiler, &ins->declaration.semantic.resource.reg);
             vkd3d_string_buffer_printf(buffer, "%s ", compiler->colours.reset);
-            shader_dump_register(compiler, &ins->declaration.semantic.resource.reg.reg);
+            shader_dump_register(compiler, &ins->declaration.semantic.resource.reg.reg, true);
             shader_dump_register_space(compiler, ins->declaration.semantic.resource.range.space);
             break;
 
         case VKD3DSIH_DCL_CONSTANT_BUFFER:
             vkd3d_string_buffer_printf(buffer, " ");
-            shader_dump_register(compiler, &ins->declaration.cb.src.reg);
+            shader_dump_register(compiler, &ins->declaration.cb.src.reg, true);
             if (shader_ver_ge(&compiler->shader_version, 5, 1))
                 shader_print_subscript(compiler, ins->declaration.cb.size, NULL);
             shader_addline(buffer, ", %s",
@@ -1548,7 +1569,7 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler,
 
         case VKD3DSIH_DCL_SAMPLER:
             vkd3d_string_buffer_printf(buffer, " ");
-            shader_dump_register(compiler, &ins->declaration.sampler.src.reg);
+            shader_dump_register(compiler, &ins->declaration.sampler.src.reg, true);
             if (ins->flags == VKD3DSI_SAMPLER_COMPARISON_MODE)
                 shader_addline(buffer, ", comparisonMode");
             shader_dump_register_space(compiler, ins->declaration.sampler.range.space);
-- 
2.31.1