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/d3d-asm: Check the actual index count in shader_print_register().

Browse Source 
vsir_register_init() does initialise offsets to ~0u, but at this point
that's not something that should be relied on.
This commit is contained in:
Henri Verbeet
2025-09-01 21:46:16 +02:00
parent 1083b31dfd
commit fdc1edb647
Notes: Henri Verbeet 2025-09-03 13:10:07 +02:00 
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1709
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/d3d_asm.c
View File

@@ -834,7 +834,7 @@ static void shader_print_register(struct vkd3d_d3d_asm_compiler *compiler, const
&& reg->type != VKD3DSPR_NULL && reg->type != VKD3DSPR_NULL
&& reg->type != VKD3DSPR_DEPTHOUT) && reg->type != VKD3DSPR_DEPTHOUT)
{ {
if (offset != ~0u) if (reg->idx_count)
{ {
bool is_sm_5_1 = vkd3d_shader_ver_ge(&compiler->shader_version, 5, 1); bool is_sm_5_1 = vkd3d_shader_ver_ge(&compiler->shader_version, 5, 1);
@@ -862,10 +862,10 @@ static void shader_print_register(struct vkd3d_d3d_asm_compiler *compiler, const
/* For descriptors in sm < 5.1 we move the reg->idx values up one slot /* For descriptors in sm < 5.1 we move the reg->idx values up one slot
* to normalise with 5.1. * to normalise with 5.1.
* Here we should ignore it if it's a descriptor in sm < 5.1. */ * Here we should ignore it if it's a descriptor in sm < 5.1. */
if (reg->idx[1].offset != ~0u && (!is_descriptor || is_sm_5_1)) if (reg->idx_count > 1 && (!is_descriptor || is_sm_5_1))
shader_print_subscript(compiler, reg->idx[1].offset, reg->idx[1].rel_addr); shader_print_subscript(compiler, reg->idx[1].offset, reg->idx[1].rel_addr);
if (reg->idx[2].offset != ~0u) if (reg->idx_count > 2)
shader_print_subscript(compiler, reg->idx[2].offset, reg->idx[2].rel_addr); shader_print_subscript(compiler, reg->idx[2].offset, reg->idx[2].rel_addr);
} }
} }