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: Refactor register-type-specific code in parameter validation.

Browse Source 
To better accommodate code for other register types.
This commit is contained in:
Giovanni Mascellani 2024-01-19 00:02:13 +01:00 committed by Alexandre Julliard
parent fb6409bda1
commit 21633fcc52
Notes: Alexandre Julliard 2024-01-23 23:03:03 +01:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/559
1 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2602,21 +2602,29 @@ static void vsir_validate_dst_param(struct validation_context *ctx,
dst->shift); dst->shift);
} }
if (dst->reg.type == VKD3DSPR_SSA && dst->reg.idx[0].offset < ctx->program->ssa_count) switch (dst->reg.type)
{ {
struct validation_context_ssa_data *data = &ctx->ssas[dst->reg.idx[0].offset]; case VKD3DSPR_SSA:
if (dst->reg.idx[0].offset < ctx->parser->program.ssa_count)
{
struct validation_context_ssa_data *data = &ctx->ssas[dst->reg.idx[0].offset];
if (data->write_mask == 0) if (data->write_mask == 0)
{ {
data->write_mask = dst->write_mask; data->write_mask = dst->write_mask;
data->first_assigned = ctx->instruction_idx; data->first_assigned = ctx->instruction_idx;
} }
else else
{ {
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_SSA_USAGE, validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_SSA_USAGE,
"SSA register is already assigned at instruction %zu.", "SSA register is already assigned at instruction %zu.",
data->first_assigned); data->first_assigned);
} }
}
break;
default:
break;
} }
} }
@ -2637,13 +2645,21 @@ static void vsir_validate_src_param(struct validation_context *ctx,
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_MODIFIERS, "Source has invalid modifiers %#x.", validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_MODIFIERS, "Source has invalid modifiers %#x.",
src->modifiers); src->modifiers);
if (src->reg.type == VKD3DSPR_SSA && src->reg.idx[0].offset < ctx->program->ssa_count) switch (src->reg.type)
{ {
struct validation_context_ssa_data *data = &ctx->ssas[src->reg.idx[0].offset]; case VKD3DSPR_SSA:
unsigned int i; if (src->reg.idx[0].offset < ctx->parser->program.ssa_count)
{
struct validation_context_ssa_data *data = &ctx->ssas[src->reg.idx[0].offset];
unsigned int i;
for (i = 0; i < VKD3D_VEC4_SIZE; ++i) for (i = 0; i < VKD3D_VEC4_SIZE; ++i)
data->read_mask |= (1u << vsir_swizzle_get_component(src->swizzle, i)); data->read_mask |= (1u << vsir_swizzle_get_component(src->swizzle, i));
}
break;
default:
break;
} }
} }