Henri Verbeet : vkd3d-shader: Add some colour to d3d-asm swizzles.

Alexandre Julliard julliard at winehq.org
Thu Feb 18 15:48:05 CST 2021


Module: vkd3d
Branch: master
Commit: 364621fa77175bc4874ed241d1fd8d768325247c
URL:    https://source.winehq.org/git/vkd3d.git/?a=commit;h=364621fa77175bc4874ed241d1fd8d768325247c

Author: Henri Verbeet <hverbeet at codeweavers.com>
Date:   Thu Feb 18 11:24:04 2021 +0100

vkd3d-shader: Add some colour to d3d-asm swizzles.

Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 libs/vkd3d-shader/trace.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c
index 06f6254..742fbce 100644
--- a/libs/vkd3d-shader/trace.c
+++ b/libs/vkd3d-shader/trace.c
@@ -307,6 +307,7 @@ struct vkd3d_d3d_asm_colours
     const char *literal;
     const char *opcode;
     const char *reg;
+    const char *swizzle;
     const char *write_mask;
 };
 
@@ -1158,12 +1159,14 @@ static void shader_dump_src_param(struct vkd3d_d3d_asm_compiler *compiler,
                 && swizzle_x == swizzle_z
                 && swizzle_x == swizzle_w)
         {
-            shader_addline(buffer, ".%c", swizzle_chars[swizzle_x]);
+            shader_addline(buffer, ".%s%c%s", compiler->colours.swizzle,
+                    swizzle_chars[swizzle_x], compiler->colours.reset);
         }
         else
         {
-            shader_addline(buffer, ".%c%c%c%c", swizzle_chars[swizzle_x], swizzle_chars[swizzle_y],
-                    swizzle_chars[swizzle_z], swizzle_chars[swizzle_w]);
+            shader_addline(buffer, ".%s%c%c%c%c%s", compiler->colours.swizzle,
+                    swizzle_chars[swizzle_x], swizzle_chars[swizzle_y],
+                    swizzle_chars[swizzle_z], swizzle_chars[swizzle_w], compiler->colours.reset);
         }
     }
     if (src_modifier == VKD3DSPSM_ABS || src_modifier == VKD3DSPSM_ABSNEG)
@@ -1688,6 +1691,7 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data,
         .literal = "",
         .opcode = "",
         .reg = "",
+        .swizzle = "",
         .write_mask = "",
     };
     static const struct vkd3d_d3d_asm_colours colours =
@@ -1696,6 +1700,7 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data,
         .literal = "\x1b[95m",
         .opcode = "\x1b[96;1m",
         .reg = "\x1b[96m",
+        .swizzle = "\x1b[93m",
         .write_mask = "\x1b[93m",
     };
 




More information about the wine-cvs mailing list