wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-04-13 05:43:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/ir: Record entering a block in the LABEL validation handler.

Browse Source
This commit is contained in:
Giovanni Mascellani 2024-09-11 22:58:18 +02:00 committed by Henri Verbeet
parent 1d21588de7
commit e1c3266793
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 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6280,6 +6280,11 @@ static void vsir_validate_label(struct validation_context *ctx, const struct vkd
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_REGISTER_TYPE, validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_REGISTER_TYPE,
"Invalid register of type %#x in a LABEL instruction, expected LABEL.", "Invalid register of type %#x in a LABEL instruction, expected LABEL.",
instruction->src[0].reg.type); instruction->src[0].reg.type);
if (ctx->inside_block)
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_CONTROL_FLOW,
"Invalid LABEL instruction inside a block.");
ctx->inside_block = true;
} }
static void vsir_validate_loop(struct validation_context *ctx, const struct vkd3d_shader_instruction *instruction) static void vsir_validate_loop(struct validation_context *ctx, const struct vkd3d_shader_instruction *instruction)
@ -6559,19 +6564,16 @@ static void vsir_validate_instruction(struct validation_context *ctx)
"Instruction %#x appear before any phase instruction in a hull shader.", "Instruction %#x appear before any phase instruction in a hull shader.",
instruction->opcode); instruction->opcode);
if (ctx->program->cf_type == VSIR_CF_BLOCKS && !vsir_instruction_is_dcl(instruction) if (ctx->program->cf_type == VSIR_CF_BLOCKS && !ctx->inside_block)
&& instruction->opcode != VKD3DSIH_NOP)
{ {
switch (instruction->opcode) switch (instruction->opcode)
{ {
case VKD3DSIH_NOP:
case VKD3DSIH_LABEL: case VKD3DSIH_LABEL:
if (ctx->inside_block)
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_CONTROL_FLOW, "Invalid LABEL instruction inside a block.");
ctx->inside_block = true;
break; break;
default: default:
if (!ctx->inside_block) if (!vsir_instruction_is_dcl(instruction))
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_CONTROL_FLOW, validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_CONTROL_FLOW,
"Invalid instruction %#x outside any block.", "Invalid instruction %#x outside any block.",
instruction->opcode); instruction->opcode);