wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/ir: Introduce a helper for validating DCL_TEMPS.

Browse Source
This commit is contained in:
Giovanni Mascellani 2024-09-11 13:05:11 +02:00 committed by Henri Verbeet
parent d30160710b
commit 35fe5b48c8
Notes: Henri Verbeet 2024-09-13 16:05:51 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1067
1 changed files with 41 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6147,6 +6147,31 @@ static void vsir_validate_cf_type(struct validation_context *ctx,
instruction->opcode, name_from_cf_type(ctx->program->cf_type)); instruction->opcode, name_from_cf_type(ctx->program->cf_type));
} }
static void vsir_validate_dcl_temps(struct validation_context *ctx,
const struct vkd3d_shader_instruction *instruction)
{
if (ctx->dcl_temps_found)
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_DUPLICATE_DCL_TEMPS,
"Duplicate DCL_TEMPS instruction.");
if (instruction->declaration.count > ctx->program->temp_count)
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_DCL_TEMPS,
"Invalid DCL_TEMPS count %u, expected at most %u.",
instruction->declaration.count, ctx->program->temp_count);
ctx->dcl_temps_found = true;
}
struct vsir_validator_instruction_desc
{
unsigned int dst_param_count;
unsigned int src_param_count;
void (*validate)(struct validation_context *ctx, const struct vkd3d_shader_instruction *instruction);
};
static const struct vsir_validator_instruction_desc vsir_validator_instructions[] =
{
[VKD3DSIH_DCL_TEMPS] = {0, 0, vsir_validate_dcl_temps},
};
static void vsir_validate_instruction(struct validation_context *ctx) static void vsir_validate_instruction(struct validation_context *ctx)
{ {
const struct vkd3d_shader_version *version = &ctx->program->shader_version; const struct vkd3d_shader_version *version = &ctx->program->shader_version;
@ -6289,20 +6314,24 @@ static void vsir_validate_instruction(struct validation_context *ctx)
} }
} }
if (instruction->opcode < ARRAY_SIZE(vsir_validator_instructions))
{
const struct vsir_validator_instruction_desc *desc;
desc = &vsir_validator_instructions[instruction->opcode];
if (desc->validate)
{
if (desc->dst_param_count != ~0u)
vsir_validate_dst_count(ctx, instruction, desc->dst_param_count);
if (desc->src_param_count != ~0u)
vsir_validate_src_count(ctx, instruction, desc->src_param_count);
desc->validate(ctx, instruction);
}
}
switch (instruction->opcode) switch (instruction->opcode)
{ {
case VKD3DSIH_DCL_TEMPS:
vsir_validate_dst_count(ctx, instruction, 0);
vsir_validate_src_count(ctx, instruction, 0);
if (ctx->dcl_temps_found)
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_DUPLICATE_DCL_TEMPS, "Duplicate DCL_TEMPS instruction.");
if (instruction->declaration.count > ctx->program->temp_count)
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_DCL_TEMPS,
"Invalid DCL_TEMPS count %u, expected at most %u.",
instruction->declaration.count, ctx->program->temp_count);
ctx->dcl_temps_found = true;
break;
case VKD3DSIH_IF: case VKD3DSIH_IF:
vsir_validate_cf_type(ctx, instruction, VSIR_CF_STRUCTURED); vsir_validate_cf_type(ctx, instruction, VSIR_CF_STRUCTURED);
vsir_validate_dst_count(ctx, instruction, 0); vsir_validate_dst_count(ctx, instruction, 0);