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: Record leaving a block in the relevant validation handlers.

Browse Source
This commit is contained in:
Giovanni Mascellani 2024-09-11 22:55:09 +02:00 committed by Henri Verbeet
parent 3e012c355d
commit 1d21588de7
Notes: Henri Verbeet 2024-09-16 14:22:01 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1074
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6193,6 +6193,8 @@ static void vsir_validate_branch(struct validation_context *ctx, const struct vk
instruction->src[i].reg.type); instruction->src[i].reg.type);
} }
} }
ctx->inside_block = false;
} }
static void vsir_validate_dcl_temps(struct validation_context *ctx, static void vsir_validate_dcl_temps(struct validation_context *ctx,
@ -6359,6 +6361,7 @@ static void vsir_validate_rep(struct validation_context *ctx, const struct vkd3d
static void vsir_validate_ret(struct validation_context *ctx, const struct vkd3d_shader_instruction *instruction) static void vsir_validate_ret(struct validation_context *ctx, const struct vkd3d_shader_instruction *instruction)
{ {
ctx->inside_block = false;
} }
static void vsir_validate_switch(struct validation_context *ctx, const struct vkd3d_shader_instruction *instruction) static void vsir_validate_switch(struct validation_context *ctx, const struct vkd3d_shader_instruction *instruction)
@ -6412,6 +6415,8 @@ static void vsir_validate_switch_monolithic(struct validation_context *ctx,
"Invalid label register for case %u of type %#x in monolithic SWITCH instruction, " "Invalid label register for case %u of type %#x in monolithic SWITCH instruction, "
"expected LABEL.", i, instruction->src[value_idx].reg.type); "expected LABEL.", i, instruction->src[value_idx].reg.type);
} }
ctx->inside_block = false;
} }
struct vsir_validator_instruction_desc struct vsir_validator_instruction_desc
@ -6565,16 +6570,6 @@ static void vsir_validate_instruction(struct validation_context *ctx)
ctx->inside_block = true; ctx->inside_block = true;
break; break;
case VKD3DSIH_RET:
case VKD3DSIH_BRANCH:
case VKD3DSIH_SWITCH_MONOLITHIC:
if (!ctx->inside_block)
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_CONTROL_FLOW,
"Invalid instruction %#x outside any block.",
instruction->opcode);
ctx->inside_block = false;
break;
default: default:
if (!ctx->inside_block) if (!ctx->inside_block)
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_CONTROL_FLOW, validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_CONTROL_FLOW,