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: Introduce a helper for validating Hull Shader phases.

Browse Source
This commit is contained in:
Giovanni Mascellani 2024-09-12 12:29:47 +02:00 committed by Henri Verbeet
parent 259273a133
commit 56ec211d04
Notes: Henri Verbeet 2024-09-16 19:36:47 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1077
1 changed files with 39 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6153,6 +6153,21 @@ static void vsir_validator_push_block(struct validation_context *ctx, enum vkd3d
ctx->blocks[ctx->depth++] = opcode; ctx->blocks[ctx->depth++] = opcode;
} }
static void vsir_validate_hull_shader_phase(struct validation_context *ctx,
const struct vkd3d_shader_instruction *instruction)
{
if (ctx->program->shader_version.type != VKD3D_SHADER_TYPE_HULL)
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_HANDLER,
"Phase instruction %#x is only valid in a hull shader.",
instruction->opcode);
if (ctx->depth != 0)
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_CONTROL_FLOW,
"Phase instruction %#x must appear to top level.",
instruction->opcode);
ctx->phase = instruction->opcode;
ctx->dcl_temps_found = false;
}
static void vsir_validate_branch(struct validation_context *ctx, const struct vkd3d_shader_instruction *instruction) static void vsir_validate_branch(struct validation_context *ctx, const struct vkd3d_shader_instruction *instruction)
{ {
size_t i; size_t i;
@ -6519,6 +6534,10 @@ 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_BRANCH] = {0, ~0u, vsir_validate_branch}, [VKD3DSIH_BRANCH] = {0, ~0u, vsir_validate_branch},
[VKD3DSIH_HS_CONTROL_POINT_PHASE] = {0, 0, vsir_validate_hull_shader_phase},
[VKD3DSIH_HS_DECLS] = {0, 0, vsir_validate_hull_shader_phase},
[VKD3DSIH_HS_FORK_PHASE] = {0, 0, vsir_validate_hull_shader_phase},
[VKD3DSIH_HS_JOIN_PHASE] = {0, 0, vsir_validate_hull_shader_phase},
[VKD3DSIH_DCL_GS_INSTANCES] = {0, 0, vsir_validate_dcl_gs_instances}, [VKD3DSIH_DCL_GS_INSTANCES] = {0, 0, vsir_validate_dcl_gs_instances},
[VKD3DSIH_DCL_HS_MAX_TESSFACTOR] = {0, 0, vsir_validate_dcl_hs_max_tessfactor}, [VKD3DSIH_DCL_HS_MAX_TESSFACTOR] = {0, 0, vsir_validate_dcl_hs_max_tessfactor},
[VKD3DSIH_DCL_INPUT_PRIMITIVE] = {0, 0, vsir_validate_dcl_input_primitive}, [VKD3DSIH_DCL_INPUT_PRIMITIVE] = {0, 0, vsir_validate_dcl_input_primitive},
@ -6566,43 +6585,36 @@ static void vsir_validate_instruction(struct validation_context *ctx)
instruction->opcode); instruction->opcode);
} }
switch (instruction->opcode) if (version->type == VKD3D_SHADER_TYPE_HULL && ctx->phase == VKD3DSIH_INVALID)
{ {
case VKD3DSIH_HS_DECLS: switch (instruction->opcode)
case VKD3DSIH_HS_CONTROL_POINT_PHASE: {
case VKD3DSIH_HS_FORK_PHASE: case VKD3DSIH_NOP:
case VKD3DSIH_HS_JOIN_PHASE: case VKD3DSIH_HS_DECLS:
vsir_validate_dst_count(ctx, instruction, 0); case VKD3DSIH_HS_CONTROL_POINT_PHASE:
vsir_validate_src_count(ctx, instruction, 0); case VKD3DSIH_HS_FORK_PHASE:
if (version->type != VKD3D_SHADER_TYPE_HULL) case VKD3DSIH_HS_JOIN_PHASE:
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_HANDLER, break;
"Phase instruction %#x is only valid in a hull shader.",
instruction->opcode);
if (ctx->depth != 0)
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_CONTROL_FLOW,
"Phase instruction %#x must appear to top level.",
instruction->opcode);
ctx->phase = instruction->opcode;
ctx->dcl_temps_found = false;
return;
default: default:
break; if (!vsir_instruction_is_dcl(instruction))
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_HANDLER,
"Instruction %#x appear before any phase instruction in a hull shader.",
instruction->opcode);
break;
}
} }
/* Only DCL instructions may occur outside hull shader phases. */
if (!vsir_instruction_is_dcl(instruction) && version->type == VKD3D_SHADER_TYPE_HULL
&& ctx->phase == VKD3DSIH_INVALID)
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_HANDLER,
"Instruction %#x appear before any phase instruction in a hull shader.",
instruction->opcode);
if (ctx->program->cf_type == VSIR_CF_BLOCKS && !ctx->inside_block) if (ctx->program->cf_type == VSIR_CF_BLOCKS && !ctx->inside_block)
{ {
switch (instruction->opcode) switch (instruction->opcode)
{ {
case VKD3DSIH_NOP: case VKD3DSIH_NOP:
case VKD3DSIH_LABEL: case VKD3DSIH_LABEL:
case VKD3DSIH_HS_DECLS:
case VKD3DSIH_HS_CONTROL_POINT_PHASE:
case VKD3DSIH_HS_FORK_PHASE:
case VKD3DSIH_HS_JOIN_PHASE:
break; break;
default: default: