vkd3d-shader/ir: Validate CONSTBUFFER registers.

This commit is contained in:
Giovanni Mascellani
2025-03-12 20:32:45 +01:00
committed by Henri Verbeet
parent 808931b108
commit 0c9c29fb34
Notes: Henri Verbeet 2025-03-17 15:29:30 +01:00
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1422

View File

@@ -7706,6 +7706,29 @@ static void vsir_validate_label_register(struct validation_context *ctx,
reg->idx[0].offset, ctx->program->block_count); reg->idx[0].offset, ctx->program->block_count);
} }
static void vsir_validate_constbuffer_register(struct validation_context *ctx,
const struct vkd3d_shader_register *reg)
{
if (reg->precision != VKD3D_SHADER_REGISTER_PRECISION_DEFAULT)
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_PRECISION,
"Invalid precision %#x for a CONSTBUFFER register.", reg->precision);
if (reg->dimension != VSIR_DIMENSION_VEC4)
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_DIMENSION,
"Invalid dimension %#x for a CONSTBUFFER register.", reg->dimension);
if (reg->idx_count != 3)
{
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX_COUNT,
"Invalid index count %u for a CONSTBUFFER register.", reg->idx_count);
return;
}
if (reg->idx[0].rel_addr)
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX,
"Non-NULL relative address for a CONSTBUFFER register ID.");
}
static void vsir_validate_sampler_register(struct validation_context *ctx, static void vsir_validate_sampler_register(struct validation_context *ctx,
const struct vkd3d_shader_register *reg) const struct vkd3d_shader_register *reg)
{ {
@@ -7943,6 +7966,10 @@ static void vsir_validate_register(struct validation_context *ctx,
vsir_validate_register_without_indices(ctx, reg); vsir_validate_register_without_indices(ctx, reg);
break; break;
case VKD3DSPR_CONSTBUFFER:
vsir_validate_constbuffer_register(ctx, reg);
break;
case VKD3DSPR_PRIMID: case VKD3DSPR_PRIMID:
vsir_validate_register_without_indices(ctx, reg); vsir_validate_register_without_indices(ctx, reg);
break; break;