[PATCH vkd3d 08/12] vkd3d-shader/hlsl: Print index paths in dump_deref().

[Francisco Casas]

Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com>
---
 libs/vkd3d-shader/hlsl.c | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c
index c7416054..924121f0 100644
--- a/libs/vkd3d-shader/hlsl.c
+++ b/libs/vkd3d-shader/hlsl.c
@@ -1562,10 +1562,23 @@ static void dump_ir_var(struct hlsl_ctx *ctx, struct vkd3d_string_buffer *buffer
 
 static void dump_deref(struct vkd3d_string_buffer *buffer, const struct hlsl_deref *deref)
 {
+    unsigned int i;
+
     if (deref->var)
     {
         vkd3d_string_buffer_printf(buffer, "%s", deref->var->name);
-        if (deref->offset.node)
+        if (deref->path_len)
+        {
+            vkd3d_string_buffer_printf(buffer, "[");
+            for (i = 0; i < deref->path_len; ++i)
+            {
+                vkd3d_string_buffer_printf(buffer, "[");
+                dump_src(buffer, &deref->path[i]);
+                vkd3d_string_buffer_printf(buffer, "]");
+            }
+            vkd3d_string_buffer_printf(buffer, "]");
+        }
+        else if (deref->offset.node)
         {
             vkd3d_string_buffer_printf(buffer, "[");
             dump_src(buffer, &deref->offset);
-- 
2.34.1

[Giovanni Mascellani]

Hi,

Il 01/07/22 23:24, Francisco Casas ha scritto:
> +            vkd3d_string_buffer_printf(buffer, "[");
> +            for (i = 0; i < deref->path_len; ++i)
> +            {
> +                vkd3d_string_buffer_printf(buffer, "[");
> +                dump_src(buffer, &deref->path[i]);
> +                vkd3d_string_buffer_printf(buffer, "]");
> +            }
> +            vkd3d_string_buffer_printf(buffer, "]");

I guess the double brackets are to distinguish this from the usual 
register offset subscripting?

Giovanni.

[Francisco Casas]

On 14-07-22 06:17, Giovanni Mascellani wrote:
> Hi,
>
> Il 01/07/22 23:24, Francisco Casas ha scritto:
> > +            vkd3d_string_buffer_printf(buffer, "[");
> > +            for (i = 0; i < deref->path_len; ++i)
> > +            {
> > +                vkd3d_string_buffer_printf(buffer, "[");
> > +                dump_src(buffer, &deref->path[i]);
> > +                vkd3d_string_buffer_printf(buffer, "]");
> > +            }
> > +            vkd3d_string_buffer_printf(buffer, "]");
>
> I guess the double brackets are to distinguish this from the usual 
> register offset subscripting?

Yep, I also think it looks nice with paths larger than 1, like in:

aaa[[0x562ff769ebd0][0x562ff769ec60]].x

or

bbb[[@24][@25][@26]]

But this is subjective.
> Giovanni.