wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-01-28 13:05:02 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader: Introduce a helper to print d3d-asm integer literals.

Browse Source 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet 2021-02-17 12:21:10 +01:00 committed by Alexandre Julliard
parent 8ff88d4544
commit 03c34076e8
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libs/vkd3d-shader/trace.c
View File

@ -708,6 +708,12 @@ static void shader_print_float_literal(struct vkd3d_d3d_asm_compiler *compiler,
vkd3d_string_buffer_printf(&compiler->buffer, "%s%.8e%s", prefix, f, suffix); vkd3d_string_buffer_printf(&compiler->buffer, "%s%.8e%s", prefix, f, suffix);
} }
static void shader_print_int_literal(struct vkd3d_d3d_asm_compiler *compiler,
const char *prefix, int i, const char *suffix)
{
vkd3d_string_buffer_printf(&compiler->buffer, "%s%d%s", prefix, i, suffix);
}
static void shader_print_subscript(struct vkd3d_d3d_asm_compiler *compiler, static void shader_print_subscript(struct vkd3d_d3d_asm_compiler *compiler,
unsigned int offset, const struct vkd3d_shader_src_param *rel_addr) unsigned int offset, const struct vkd3d_shader_src_param *rel_addr)
{ {
@ -948,7 +954,7 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const
shader_print_float_literal(compiler, "", reg->u.immconst_float[0], ""); shader_print_float_literal(compiler, "", reg->u.immconst_float[0], "");
break; break;
case VKD3D_DATA_INT: case VKD3D_DATA_INT:
shader_addline(buffer, "%d", reg->u.immconst_uint[0]); shader_print_int_literal(compiler, "", reg->u.immconst_uint[0], "");
break; break;
case VKD3D_DATA_RESOURCE: case VKD3D_DATA_RESOURCE:
case VKD3D_DATA_SAMPLER: case VKD3D_DATA_SAMPLER:
@ -971,9 +977,10 @@ static void shader_dump_register(struct vkd3d_d3d_asm_compiler *compiler, const
shader_print_float_literal(compiler, ", ", reg->u.immconst_float[3], ""); shader_print_float_literal(compiler, ", ", reg->u.immconst_float[3], "");
break; break;
case VKD3D_DATA_INT: case VKD3D_DATA_INT:
shader_addline(buffer, "%d, %d, %d, %d", shader_print_int_literal(compiler, "", reg->u.immconst_uint[0], "");
reg->u.immconst_uint[0], reg->u.immconst_uint[1], shader_print_int_literal(compiler, ", ", reg->u.immconst_uint[1], "");
reg->u.immconst_uint[2], reg->u.immconst_uint[3]); shader_print_int_literal(compiler, ", ", reg->u.immconst_uint[2], "");
shader_print_int_literal(compiler, ", ", reg->u.immconst_uint[3], "");
break; break;
case VKD3D_DATA_RESOURCE: case VKD3D_DATA_RESOURCE:
case VKD3D_DATA_SAMPLER: case VKD3D_DATA_SAMPLER:
@ -1574,10 +1581,12 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler,
break; break;
case VKD3DSIH_DEFI: case VKD3DSIH_DEFI:
vkd3d_string_buffer_printf(buffer, " %si%u%s = %d, %d, %d, %d", vkd3d_string_buffer_printf(buffer, " %si%u%s", compiler->colours.reg,
compiler->colours.reg, ins->dst[0].reg.idx[0].offset, compiler->colours.reset, ins->dst[0].reg.idx[0].offset, compiler->colours.reset);
ins->src[0].reg.u.immconst_uint[0], ins->src[0].reg.u.immconst_uint[1], shader_print_int_literal(compiler, " = ", ins->src[0].reg.u.immconst_uint[0], "");
ins->src[0].reg.u.immconst_uint[2], ins->src[0].reg.u.immconst_uint[3]); shader_print_int_literal(compiler, ", ", ins->src[0].reg.u.immconst_uint[1], "");
shader_print_int_literal(compiler, ", ", ins->src[0].reg.u.immconst_uint[2], "");
shader_print_int_literal(compiler, ", ", ins->src[0].reg.u.immconst_uint[3], "");
break; break;
case VKD3DSIH_DEFB: case VKD3DSIH_DEFB:
@ -1590,8 +1599,9 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler,
shader_dump_instruction_flags(compiler, ins); shader_dump_instruction_flags(compiler, ins);
if (vkd3d_shader_instruction_has_texel_offset(ins)) if (vkd3d_shader_instruction_has_texel_offset(ins))
{ {
shader_addline(buffer, "(%d,%d,%d)", shader_print_int_literal(compiler, "(", ins->texel_offset.u, "");
ins->texel_offset.u, ins->texel_offset.v, ins->texel_offset.w); shader_print_int_literal(compiler, ",", ins->texel_offset.v, "");
shader_print_int_literal(compiler, ",", ins->texel_offset.w, ")");
} }
if (ins->resource_type != VKD3D_SHADER_RESOURCE_NONE) if (ins->resource_type != VKD3D_SHADER_RESOURCE_NONE)