vkd3d-shader/ir: Validate the register type for registers used as relative addresses.

This commit is contained in:
Giovanni Mascellani 2024-09-26 22:03:51 +02:00 committed by Henri Verbeet
parent abf7a91834
commit b5e1c45827
Notes: Henri Verbeet 2024-12-05 21:36:17 +01:00
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1300

View File

@ -7647,8 +7647,26 @@ static void vsir_validate_register(struct validation_context *ctx,
for (i = 0; i < min(reg->idx_count, ARRAY_SIZE(reg->idx)); ++i)
{
const struct vkd3d_shader_src_param *param = reg->idx[i].rel_addr;
if (reg->idx[i].rel_addr)
if (param)
{
vsir_validate_src_param(ctx, param);
switch (param->reg.type)
{
case VKD3DSPR_TEMP:
case VKD3DSPR_SSA:
case VKD3DSPR_ADDR:
case VKD3DSPR_LOOP:
case VKD3DSPR_OUTPOINTID:
break;
default:
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_REGISTER_TYPE,
"Invalid register type %#x for a relative address parameter.",
param->reg.type);
break;
}
}
}
switch (reg->type)