Henri Verbeet : vkd3d-shader: Respect VKD3D_SHADER_COMPILE_OPTION_FORMATTING_INDENT for d3d-asm output.
Alexandre Julliard
julliard at winehq.org
Fri Feb 19 16:42:49 CST 2021
Module: vkd3d
Branch: master
Commit: 7a791f5ef9d3eeedbf55f3b4d597af1e5a181551
URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=7a791f5ef9d3eeedbf55f3b4d597af1e5a181551
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Fri Feb 19 15:57:08 2021 +0100
vkd3d-shader: Respect VKD3D_SHADER_COMPILE_OPTION_FORMATTING_INDENT for d3d-asm output.
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
libs/vkd3d-shader/trace.c | 39 ++++++++++++++++++++++++++++++++++++++-
1 file changed, 38 insertions(+), 1 deletion(-)
diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c
index afc81d3..6e1b3a0 100644
--- a/libs/vkd3d-shader/trace.c
+++ b/libs/vkd3d-shader/trace.c
@@ -1682,8 +1682,9 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data,
struct vkd3d_d3d_asm_compiler compiler;
enum vkd3d_result result = VKD3D_OK;
struct vkd3d_string_buffer *buffer;
+ unsigned int indent, i;
+ const char *indent_str;
const DWORD *ptr;
- unsigned int i;
void *code;
static const struct vkd3d_d3d_asm_colours no_colours =
@@ -1724,6 +1725,10 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data,
compiler.colours = colours;
else
compiler.colours = no_colours;
+ if (formatting & VKD3D_SHADER_COMPILE_OPTION_FORMATTING_INDENT)
+ indent_str = " ";
+ else
+ indent_str = "";
buffer = &compiler.buffer;
vkd3d_string_buffer_init(buffer);
@@ -1734,6 +1739,7 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data,
shader_get_type_prefix(shader_version->type), shader_version->major,
shader_version->minor, compiler.colours.reset);
+ indent = 0;
while (!shader_sm4_is_end(data, &ptr))
{
struct vkd3d_shader_instruction ins;
@@ -1747,7 +1753,38 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(void *data,
continue;
}
+ switch (ins.handler_idx)
+ {
+ case VKD3DSIH_ELSE:
+ case VKD3DSIH_ENDIF:
+ case VKD3DSIH_ENDLOOP:
+ case VKD3DSIH_ENDSWITCH:
+ --indent;
+ break;
+
+ default:
+ break;
+ }
+
+ for (i = 0; i < indent; ++i)
+ {
+ vkd3d_string_buffer_printf(buffer, "%s", indent_str);
+ }
+
shader_dump_instruction(&compiler, &ins);
+
+ switch (ins.handler_idx)
+ {
+ case VKD3DSIH_ELSE:
+ case VKD3DSIH_IF:
+ case VKD3DSIH_LOOP:
+ case VKD3DSIH_SWITCH:
+ ++indent;
+ break;
+
+ default:
+ break;
+ }
}
if ((code = vkd3d_malloc(buffer->content_size)))
More information about the wine-cvs
mailing list