[PATCH vkd3d-shader 1/3] vkd3d-shader: Print oC registers as o in versions >= 4.

[Isabella Bosia]

Signed-off-by: Isabella Bosia 
---
 libs/vkd3d-shader/trace.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c
index d86a84a..02abbf9 100644
--- a/libs/vkd3d-shader/trace.c
+++ b/libs/vkd3d-shader/trace.c
@@ -700,7 +700,9 @@ static void shader_dump_register(struct vkd3d_string_buffer *buffer,
             break;

case VKD3DSPR_COLOROUT:
-            shader_addline(buffer, "oC");
+            shader_addline(buffer, "o");
+            if (!shader_ver_ge(shader_version, 4, 0))
+                shader_addline(buffer, "C");
             break;

case VKD3DSPR_DEPTHOUT:

[PATCH vkd3d-shader 2/3] vkd3d-shader: Print abs(x) as |x|.

[Isabella Bosia]

Signed-off-by: Isabella Bosia 
---
 libs/vkd3d-shader/trace.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c
index 02abbf9..1e1f819 100644
--- a/libs/vkd3d-shader/trace.c
+++ b/libs/vkd3d-shader/trace.c
@@ -1033,7 +1033,7 @@ static void shader_dump_src_param(struct vkd3d_string_buffer *buffer,
         shader_addline(buffer, "!");

if (src_modifier == VKD3DSPSM_ABS || src_modifier == VKD3DSPSM_ABSNEG)
-        shader_addline(buffer, "abs(");
+        shader_addline(buffer, "|");

shader_dump_register(buffer, &param->reg, shader_version);

@@ -1051,8 +1051,8 @@ static void shader_dump_src_param(struct vkd3d_string_buffer *buffer,
         case VKD3DSPSM_X2NEG:   shader_addline(buffer, "_x2"); break;
         case VKD3DSPSM_DZ:      shader_addline(buffer, "_dz"); break;
         case VKD3DSPSM_DW:      shader_addline(buffer, "_dw"); break;
-        case VKD3DSPSM_ABSNEG:  shader_addline(buffer, ")"); break;
-        case VKD3DSPSM_ABS:     shader_addline(buffer, ")"); break;
+        case VKD3DSPSM_ABSNEG:
+        case VKD3DSPSM_ABS:     /* handled later */ break;
         default:                  shader_addline(buffer, "_unknown_modifier(%#x)", src_modifier);
     }

@@ -1076,6 +1076,8 @@ static void shader_dump_src_param(struct vkd3d_string_buffer *buffer,
                     swizzle_chars[swizzle_z], swizzle_chars[swizzle_w]);
         }
     }
+    if (src_modifier == VKD3DSPSM_ABS || src_modifier == VKD3DSPSM_ABSNEG)
+        shader_addline(buffer, "|");
 }

static void shader_dump_ins_modifiers(struct vkd3d_string_buffer *buffer,

[PATCH vkd3d-shader 2/3] vkd3d-shader: Print abs(x) as |x|.

[Henri Verbeet]

Signed-off-by: Henri Verbeet

[PATCH vkd3d-shader 3/3] vkd3d-shader: Make shader_dump_data_type print the type 4 times.

[Isabella Bosia]

Signed-off-by: Isabella Bosia 
---
 libs/vkd3d-shader/trace.c | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c
index 1e1f819..587c85c 100644
--- a/libs/vkd3d-shader/trace.c
+++ b/libs/vkd3d-shader/trace.c
@@ -530,21 +530,24 @@ static void shader_dump_data_type(struct vkd3d_string_buffer *buffer, enum vkd3d
 {
     static const char *const data_type_names[] =
     {
-        /* VKD3D_DATA_FLOAT    */ "(float)",
-        /* VKD3D_DATA_INT      */ "(int)",
-        /* VKD3D_DATA_RESOURCE */ "(resource)",
-        /* VKD3D_DATA_SAMPLER  */ "(sampler)",
-        /* VKD3D_DATA_UAV      */ "(uav)",
-        /* VKD3D_DATA_UINT     */ "(uint)",
-        /* VKD3D_DATA_UNORM    */ "(unorm)",
-        /* VKD3D_DATA_SNORM    */ "(snorm)",
-        /* VKD3D_DATA_OPAQUE   */ "(opaque)",
+        /* VKD3D_DATA_FLOAT    */ "float",
+        /* VKD3D_DATA_INT      */ "int",
+        /* VKD3D_DATA_RESOURCE */ "resource",
+        /* VKD3D_DATA_SAMPLER  */ "sampler",
+        /* VKD3D_DATA_UAV      */ "uav",
+        /* VKD3D_DATA_UINT     */ "uint",
+        /* VKD3D_DATA_UNORM    */ "unorm",
+        /* VKD3D_DATA_SNORM    */ "snorm",
+        /* VKD3D_DATA_OPAQUE   */ "opaque",
     };
+    const char *name;

if (type <= ARRAY_SIZE(data_type_names))
-        shader_addline(buffer, "%s", data_type_names[type]);
+        name = data_type_names[type];
     else
-        shader_addline(buffer, "(unknown)");
+        name = "unknown";
+
+    shader_addline(buffer, "(%s,%s,%s,%s)", name, name, name, name);
 }

static void shader_dump_decl_usage(struct vkd3d_string_buffer *buffer,

[PATCH vkd3d-shader 3/3] vkd3d-shader: Make shader_dump_data_type print the type 4 times.

[Henri Verbeet]

Signed-off-by: Henri Verbeet

[Henri Verbeet]

Signed-off-by: Henri Verbeet