wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-09-12 18:50:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/hlsl: Only dump store writemasks for single register types.

Browse Source 
This fixes a segfault on matrix stores in dump_ir_store().
This commit is contained in:
Shaun Ren
2025-05-14 16:03:19 -04:00
committed by Henri Verbeet
parent d8edf20c2b
commit 3bf232e841
Notes: Henri Verbeet 2025-06-24 16:31:45 +02:00 
Approved-by: Elizabeth Figura (@zfigura)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1553
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/vkd3d-shader/hlsl.c
View File

@@ -3831,11 +3831,11 @@ static void dump_ir_string(struct vkd3d_string_buffer *buffer, const struct hlsl
vkd3d_string_buffer_printf(buffer, "\"%s\"", debugstr_a(string->string)); vkd3d_string_buffer_printf(buffer, "\"%s\"", debugstr_a(string->string));
} }
static void dump_ir_store(struct vkd3d_string_buffer *buffer, const struct hlsl_ir_store *store) static void dump_ir_store(struct hlsl_ctx *ctx, struct vkd3d_string_buffer *buffer, const struct hlsl_ir_store *store)
{ {
vkd3d_string_buffer_printf(buffer, "= ("); vkd3d_string_buffer_printf(buffer, "= (");
dump_deref(buffer, &store->lhs); dump_deref(buffer, &store->lhs);
if (store->writemask != VKD3DSP_WRITEMASK_ALL) if (store->writemask != VKD3DSP_WRITEMASK_ALL && type_is_single_reg(hlsl_deref_get_type(ctx, &store->lhs)))
vkd3d_string_buffer_printf(buffer, "%s", debug_hlsl_writemask(store->writemask)); vkd3d_string_buffer_printf(buffer, "%s", debug_hlsl_writemask(store->writemask));
vkd3d_string_buffer_printf(buffer, " "); vkd3d_string_buffer_printf(buffer, " ");
dump_src(buffer, &store->rhs); dump_src(buffer, &store->rhs);
@@ -4033,7 +4033,7 @@ static void dump_instr(struct hlsl_ctx *ctx, struct vkd3d_string_buffer *buffer,
break; break;
case HLSL_IR_STORE: case HLSL_IR_STORE:
dump_ir_store(buffer, hlsl_ir_store(instr)); dump_ir_store(ctx, buffer, hlsl_ir_store(instr));
break; break;
case HLSL_IR_SWITCH: case HLSL_IR_SWITCH: