Isabella Bosia : vkd3d-shader: Only print brackets when necessary.

Alexandre Julliard julliard at winehq.org
Thu Sep 17 15:50:41 CDT 2020


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

Author: Isabella Bosia <ibosia at codeweavers.com>
Date:   Wed Sep 16 12:45:37 2020 +0100

vkd3d-shader: Only print brackets when necessary.

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 | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c
index f4d735b..6412208 100644
--- a/libs/vkd3d-shader/trace.c
+++ b/libs/vkd3d-shader/trace.c
@@ -937,13 +937,23 @@ static void shader_dump_register(struct vkd3d_string_buffer *buffer,
     {
         if (offset != ~0u)
         {
-            shader_addline(buffer, "[");
+            bool printbrackets = reg->idx[0].rel_addr
+                || reg->type == VKD3DSPR_INCONTROLPOINT
+                || reg->type == VKD3DSPR_IMMCONSTBUFFER
+                || ((shader_version->type == VKD3D_SHADER_TYPE_GEOMETRY
+                            || shader_version->type == VKD3D_SHADER_TYPE_HULL)
+                        && reg->type == VKD3DSPR_INPUT);
+
+            if (printbrackets)
+                shader_addline(buffer, "[");
             if (reg->idx[0].rel_addr)
             {
                 shader_dump_src_param(buffer, reg->idx[0].rel_addr, shader_version);
                 shader_addline(buffer, " + ");
             }
-            shader_addline(buffer, "%u]", offset);
+            shader_addline(buffer, "%u", offset);
+            if (printbrackets)
+                shader_addline(buffer, "]");
 
             if (reg->idx[1].offset != ~0u)
             {




More information about the wine-cvs mailing list