wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-09-13 09:16:14 -07:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Giovanni Mascellani 2024-09-11 13:27:26 +02:00 committed by Henri Verbeet
parent 34c8aaad29
commit 5ce10b9e68
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 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6203,6 +6203,13 @@ static void vsir_validate_ifc(struct validation_context *ctx, const struct vkd3d
vsir_validator_push_block(ctx, VKD3DSIH_IF); vsir_validator_push_block(ctx, VKD3DSIH_IF);
} }
static void vsir_validate_loop(struct validation_context *ctx, const struct vkd3d_shader_instruction *instruction)
{
vsir_validate_cf_type(ctx, instruction, VSIR_CF_STRUCTURED);
vsir_validate_src_count(ctx, instruction, ctx->program->shader_version.major <= 3 ? 2 : 0);
vsir_validator_push_block(ctx, VKD3DSIH_LOOP);
}
struct vsir_validator_instruction_desc struct vsir_validator_instruction_desc
{ {
unsigned int dst_param_count; unsigned int dst_param_count;
@ -6212,11 +6219,12 @@ struct vsir_validator_instruction_desc
static const struct vsir_validator_instruction_desc vsir_validator_instructions[] = static const struct vsir_validator_instruction_desc vsir_validator_instructions[] =
{ {
[VKD3DSIH_DCL_TEMPS] = {0, 0, vsir_validate_dcl_temps}, [VKD3DSIH_DCL_TEMPS] = {0, 0, vsir_validate_dcl_temps},
[VKD3DSIH_ELSE] = {0, 0, vsir_validate_else}, [VKD3DSIH_ELSE] = {0, 0, vsir_validate_else},
[VKD3DSIH_ENDIF] = {0, 0, vsir_validate_endif}, [VKD3DSIH_ENDIF] = {0, 0, vsir_validate_endif},
[VKD3DSIH_IF] = {0, 1, vsir_validate_if}, [VKD3DSIH_IF] = {0, 1, vsir_validate_if},
[VKD3DSIH_IFC] = {0, 2, vsir_validate_ifc}, [VKD3DSIH_IFC] = {0, 2, vsir_validate_ifc},
[VKD3DSIH_LOOP] = {0, ~0u, vsir_validate_loop},
}; };
static void vsir_validate_instruction(struct validation_context *ctx) static void vsir_validate_instruction(struct validation_context *ctx)
@ -6379,15 +6387,6 @@ static void vsir_validate_instruction(struct validation_context *ctx)
switch (instruction->opcode) switch (instruction->opcode)
{ {
case VKD3DSIH_LOOP:
vsir_validate_cf_type(ctx, instruction, VSIR_CF_STRUCTURED);
vsir_validate_dst_count(ctx, instruction, 0);
vsir_validate_src_count(ctx, instruction, version->major <= 3 ? 2 : 0);
if (!vkd3d_array_reserve((void **)&ctx->blocks, &ctx->blocks_capacity, ctx->depth + 1, sizeof(*ctx->blocks)))
return;
ctx->blocks[ctx->depth++] = instruction->opcode;
break;
case VKD3DSIH_ENDLOOP: case VKD3DSIH_ENDLOOP:
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);