commit 4a013688093c01663f16cf2e1d4752beeb2e3807
author Matteo Bruni <mbruni@codeweavers.com> Wed Jul 11 17:27:53 2012 +0200
committer Alexandre Julliard <julliard@winehq.org> Wed Jul 11 11:18:04 2012 -0500
tree 181033e4b0dafaf9f3b04951eb43db7675aa93a1
parent 995fb30d58e08b4def6112533f8a19823712a5a2

d3dcompiler: Improve debug_hlsl_type function.

dlls/d3dcompiler_43/utils.c

diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c
index 880a484..2d4eefb 100644
--- a/dlls/d3dcompiler_43/utils.c
+++ b/dlls/d3dcompiler_43/utils.c
@@ -999,16 +999,16 @@
         return debugstr_a(type->name);
 
     if (type->type == HLSL_CLASS_STRUCT)
-        name = "<anonymous struct>";
-    else
-        name = debug_base_type(type);
+        return "<anonymous struct>";
+
+    name = debug_base_type(type);
 
     if (type->type == HLSL_CLASS_SCALAR)
         return wine_dbg_sprintf("%s", name);
     if (type->type == HLSL_CLASS_VECTOR)
-        return wine_dbg_sprintf("vector<%s, %u>", name, type->dimx);
+        return wine_dbg_sprintf("%s%u", name, type->dimx);
     if (type->type == HLSL_CLASS_MATRIX)
-        return wine_dbg_sprintf("matrix<%s, %u, %u>", name, type->dimx, type->dimy);
+        return wine_dbg_sprintf("%s%ux%u", name, type->dimx, type->dimy);
     return "unexpected_type";
 }