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/ir: Simplify shader_register_normalise_arrayed_addressing().

Browse Source 
The two branches do essentially the same thing, but in different
ways and each one omitting different details. In particular there
is no need to discriminate on whether the register is a relative
address, we can just copy the NULL pointer.
This commit is contained in:
Giovanni Mascellani 2024-12-16 23:50:01 +01:00 committed by Henri Verbeet
parent 3db458697e
commit a68fd1b0de
Notes: Henri Verbeet 2024-12-17 16:53:46 +01:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1323
1 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
libs/vkd3d-shader/ir.c
View File

@ -2055,31 +2055,17 @@ static unsigned int shader_register_normalise_arrayed_addressing(struct vkd3d_sh
{ {
VKD3D_ASSERT(id_idx < ARRAY_SIZE(reg->idx) - 1); VKD3D_ASSERT(id_idx < ARRAY_SIZE(reg->idx) - 1);
/* For a relative-addressed register index, move the id up a slot to separate it from the address, /* Make room for the array index at the front of the array. */
* because rel_addr can be replaced with a constant offset in some cases. */ ++id_idx;
if (reg->idx[id_idx].rel_addr) memmove(&reg->idx[1], &reg->idx[0], id_idx * sizeof(reg->idx[0]));
{
reg->idx[id_idx + 1].rel_addr = NULL; /* The array index inherits the register relative address, but is offsetted
reg->idx[id_idx + 1].offset = reg->idx[id_idx].offset; * by the signature element register index. */
reg->idx[id_idx].offset -= register_index; reg->idx[0].rel_addr = reg->idx[id_idx].rel_addr;
if (id_idx) reg->idx[0].offset = reg->idx[id_idx].offset - register_index;
{ reg->idx[id_idx].rel_addr = NULL;
/* idx[id_idx] now contains the array index, which must be moved below the control point id. */
struct vkd3d_shader_register_index tmp = reg->idx[id_idx]; /* The signature index offset will be fixed in the caller. */
reg->idx[id_idx] = reg->idx[id_idx - 1];
reg->idx[id_idx - 1] = tmp;
}
++id_idx;
}
/* Otherwise we have no address for the arrayed register, so insert one. This happens e.g. where
* tessellation level registers are merged into an array because they're an array in SPIR-V. */
else
{
++id_idx;
memmove(&reg->idx[1], &reg->idx[0], id_idx * sizeof(reg->idx[0]));
reg->idx[0].rel_addr = NULL;
reg->idx[0].offset = reg->idx[id_idx].offset - register_index;
}
return id_idx; return id_idx;
} }