Isabella Bosia : vkd3d-shader: Print abs(x) as |x|.

Alexandre Julliard julliard at winehq.org
Fri Sep 18 15:52:41 CDT 2020


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

Author: Isabella Bosia <ibosia at codeweavers.com>
Date:   Thu Sep 17 00:14:44 2020 +0100

vkd3d-shader: Print abs(x) as |x|.

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

---

 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,




More information about the wine-cvs mailing list