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/d3d-asm: Pass a prefix and suffix to shader_dump_dst_param().

Browse Source
This commit is contained in:
Henri Verbeet 2024-03-14 19:23:41 +01:00 committed by Alexandre Julliard
parent e2d1a878a7
commit 164608a007
Notes: Alexandre Julliard 2024-03-18 23:26:29 +01:00 
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/727
1 changed files with 16 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
libs/vkd3d-shader/d3d_asm.c
View File

@ -1422,11 +1422,12 @@ static void shader_print_write_mask(struct vkd3d_d3d_asm_compiler *compiler,
compiler->colours.write_mask, buffer, compiler->colours.reset, suffix); compiler->colours.write_mask, buffer, compiler->colours.reset, suffix);
} }
static void shader_dump_dst_param(struct vkd3d_d3d_asm_compiler *compiler, static void shader_print_dst_param(struct vkd3d_d3d_asm_compiler *compiler,
const struct vkd3d_shader_dst_param *param, bool is_declaration) const char *prefix, const struct vkd3d_shader_dst_param *param, bool is_declaration, const char *suffix)
{ {
uint32_t write_mask = param->write_mask; uint32_t write_mask = param->write_mask;
vkd3d_string_buffer_printf(&compiler->buffer, "%s", prefix);
shader_dump_register(compiler, &param->reg, is_declaration); shader_dump_register(compiler, &param->reg, is_declaration);
if (write_mask && param->reg.dimension == VSIR_DIMENSION_VEC4) if (write_mask && param->reg.dimension == VSIR_DIMENSION_VEC4)
@ -1440,6 +1441,7 @@ static void shader_dump_dst_param(struct vkd3d_d3d_asm_compiler *compiler,
shader_print_precision(compiler, &param->reg); shader_print_precision(compiler, &param->reg);
shader_print_non_uniform(compiler, &param->reg); shader_print_non_uniform(compiler, &param->reg);
shader_dump_reg_type(compiler, &param->reg); shader_dump_reg_type(compiler, &param->reg);
vkd3d_string_buffer_printf(&compiler->buffer, "%s", suffix);
} }
static void shader_print_src_param(struct vkd3d_d3d_asm_compiler *compiler, static void shader_print_src_param(struct vkd3d_d3d_asm_compiler *compiler,
@ -1858,8 +1860,7 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler,
break; break;
case VKD3DSIH_DCL_INDEX_RANGE: case VKD3DSIH_DCL_INDEX_RANGE:
vkd3d_string_buffer_printf(buffer, " "); shader_print_dst_param(compiler, " ", &ins->declaration.index_range.dst, true, "");
shader_dump_dst_param(compiler, &ins->declaration.index_range.dst, true);
shader_print_uint_literal(compiler, " ", ins->declaration.index_range.register_count, ""); shader_print_uint_literal(compiler, " ", ins->declaration.index_range.register_count, "");
break; break;
@ -1877,16 +1878,14 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler,
case VKD3DSIH_DCL_INPUT_PS: case VKD3DSIH_DCL_INPUT_PS:
vkd3d_string_buffer_printf(buffer, " "); vkd3d_string_buffer_printf(buffer, " ");
shader_dump_interpolation_mode(compiler, ins->flags); shader_dump_interpolation_mode(compiler, ins->flags);
shader_addline(buffer, " "); shader_print_dst_param(compiler, " ", &ins->declaration.dst, true, "");
shader_dump_dst_param(compiler, &ins->declaration.dst, true);
break; break;
case VKD3DSIH_DCL_INPUT_PS_SGV: case VKD3DSIH_DCL_INPUT_PS_SGV:
case VKD3DSIH_DCL_INPUT_SGV: case VKD3DSIH_DCL_INPUT_SGV:
case VKD3DSIH_DCL_INPUT_SIV: case VKD3DSIH_DCL_INPUT_SIV:
case VKD3DSIH_DCL_OUTPUT_SIV: case VKD3DSIH_DCL_OUTPUT_SIV:
vkd3d_string_buffer_printf(buffer, " "); shader_print_dst_param(compiler, " ", &ins->declaration.register_semantic.reg, true, "");
shader_dump_dst_param(compiler, &ins->declaration.register_semantic.reg, true);
shader_addline(buffer, ", "); shader_addline(buffer, ", ");
shader_dump_shader_input_sysval_semantic(compiler, ins->declaration.register_semantic.sysval_semantic); shader_dump_shader_input_sysval_semantic(compiler, ins->declaration.register_semantic.sysval_semantic);
break; break;
@ -1894,16 +1893,14 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler,
case VKD3DSIH_DCL_INPUT_PS_SIV: case VKD3DSIH_DCL_INPUT_PS_SIV:
vkd3d_string_buffer_printf(buffer, " "); vkd3d_string_buffer_printf(buffer, " ");
shader_dump_interpolation_mode(compiler, ins->flags); shader_dump_interpolation_mode(compiler, ins->flags);
shader_addline(buffer, " "); shader_print_dst_param(compiler, " ", &ins->declaration.register_semantic.reg, true, "");
shader_dump_dst_param(compiler, &ins->declaration.register_semantic.reg, true);
shader_addline(buffer, ", "); shader_addline(buffer, ", ");
shader_dump_shader_input_sysval_semantic(compiler, ins->declaration.register_semantic.sysval_semantic); shader_dump_shader_input_sysval_semantic(compiler, ins->declaration.register_semantic.sysval_semantic);
break; break;
case VKD3DSIH_DCL_INPUT: case VKD3DSIH_DCL_INPUT:
case VKD3DSIH_DCL_OUTPUT: case VKD3DSIH_DCL_OUTPUT:
vkd3d_string_buffer_printf(buffer, " "); shader_print_dst_param(compiler, " ", &ins->declaration.dst, true, "");
shader_dump_dst_param(compiler, &ins->declaration.dst, true);
break; break;
case VKD3DSIH_DCL_INPUT_PRIMITIVE: case VKD3DSIH_DCL_INPUT_PRIMITIVE:
@ -1920,14 +1917,12 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler,
break; break;
case VKD3DSIH_DCL_RESOURCE_RAW: case VKD3DSIH_DCL_RESOURCE_RAW:
vkd3d_string_buffer_printf(buffer, " "); shader_print_dst_param(compiler, " ", &ins->declaration.raw_resource.resource.reg, true, "");
shader_dump_dst_param(compiler, &ins->declaration.raw_resource.resource.reg, true);
shader_dump_register_space(compiler, ins->declaration.raw_resource.resource.range.space); shader_dump_register_space(compiler, ins->declaration.raw_resource.resource.range.space);
break; break;
case VKD3DSIH_DCL_RESOURCE_STRUCTURED: case VKD3DSIH_DCL_RESOURCE_STRUCTURED:
vkd3d_string_buffer_printf(buffer, " "); shader_print_dst_param(compiler, " ", &ins->declaration.structured_resource.resource.reg, true, "");
shader_dump_dst_param(compiler, &ins->declaration.structured_resource.resource.reg, true);
shader_print_uint_literal(compiler, ", ", ins->declaration.structured_resource.byte_stride, ""); shader_print_uint_literal(compiler, ", ", ins->declaration.structured_resource.byte_stride, "");
shader_dump_register_space(compiler, ins->declaration.structured_resource.resource.range.space); shader_dump_register_space(compiler, ins->declaration.structured_resource.resource.range.space);
break; break;
@ -1963,14 +1958,12 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler,
break; break;
case VKD3DSIH_DCL_TGSM_RAW: case VKD3DSIH_DCL_TGSM_RAW:
vkd3d_string_buffer_printf(buffer, " "); shader_print_dst_param(compiler, " ", &ins->declaration.tgsm_raw.reg, true, "");
shader_dump_dst_param(compiler, &ins->declaration.tgsm_raw.reg, true);
shader_print_uint_literal(compiler, ", ", ins->declaration.tgsm_raw.byte_count, ""); shader_print_uint_literal(compiler, ", ", ins->declaration.tgsm_raw.byte_count, "");
break; break;
case VKD3DSIH_DCL_TGSM_STRUCTURED: case VKD3DSIH_DCL_TGSM_STRUCTURED:
vkd3d_string_buffer_printf(buffer, " "); shader_print_dst_param(compiler, " ", &ins->declaration.tgsm_structured.reg, true, "");
shader_dump_dst_param(compiler, &ins->declaration.tgsm_structured.reg, true);
shader_print_uint_literal(compiler, ", ", ins->declaration.tgsm_structured.byte_stride, ""); shader_print_uint_literal(compiler, ", ", ins->declaration.tgsm_structured.byte_stride, "");
shader_print_uint_literal(compiler, ", ", ins->declaration.tgsm_structured.structure_count, ""); shader_print_uint_literal(compiler, ", ", ins->declaration.tgsm_structured.structure_count, "");
break; break;
@ -1983,15 +1976,13 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler,
case VKD3DSIH_DCL_UAV_RAW: case VKD3DSIH_DCL_UAV_RAW:
shader_dump_uav_flags(compiler, ins->flags); shader_dump_uav_flags(compiler, ins->flags);
shader_addline(buffer, " "); shader_print_dst_param(compiler, " ", &ins->declaration.raw_resource.resource.reg, true, "");
shader_dump_dst_param(compiler, &ins->declaration.raw_resource.resource.reg, true);
shader_dump_register_space(compiler, ins->declaration.raw_resource.resource.range.space); shader_dump_register_space(compiler, ins->declaration.raw_resource.resource.range.space);
break; break;
case VKD3DSIH_DCL_UAV_STRUCTURED: case VKD3DSIH_DCL_UAV_STRUCTURED:
shader_dump_uav_flags(compiler, ins->flags); shader_dump_uav_flags(compiler, ins->flags);
shader_addline(buffer, " "); shader_print_dst_param(compiler, " ", &ins->declaration.structured_resource.resource.reg, true, "");
shader_dump_dst_param(compiler, &ins->declaration.structured_resource.resource.reg, true);
shader_print_uint_literal(compiler, ", ", ins->declaration.structured_resource.byte_stride, ""); shader_print_uint_literal(compiler, ", ", ins->declaration.structured_resource.byte_stride, "");
shader_dump_register_space(compiler, ins->declaration.structured_resource.resource.range.space); shader_dump_register_space(compiler, ins->declaration.structured_resource.resource.range.space);
break; break;
@ -2053,8 +2044,7 @@ static void shader_dump_instruction(struct vkd3d_d3d_asm_compiler *compiler,
for (i = 0; i < ins->dst_count; ++i) for (i = 0; i < ins->dst_count; ++i)
{ {
shader_dump_ins_modifiers(compiler, &ins->dst[i]); shader_dump_ins_modifiers(compiler, &ins->dst[i]);
shader_addline(buffer, !i ? " " : ", "); shader_print_dst_param(compiler, !i ? " " : ", ", &ins->dst[i], false, "");
shader_dump_dst_param(compiler, &ins->dst[i], false);
} }
/* Other source tokens */ /* Other source tokens */