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: Introduce a helper for validating DCL_OUTPUT_CONTROL_POINT_COUNT.

Browse Source
This commit is contained in:
Giovanni Mascellani 2024-09-12 12:03:29 +02:00 committed by Henri Verbeet
parent 0e9fcb1431
commit 8aa2364381
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 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6225,6 +6225,15 @@ static void vsir_validate_dcl_input_primitive(struct validation_context *ctx,
instruction->declaration.primitive_type.type); instruction->declaration.primitive_type.type);
} }
static void vsir_validate_dcl_output_control_point_count(struct validation_context *ctx,
const struct vkd3d_shader_instruction *instruction)
{
if (!instruction->declaration.count || instruction->declaration.count > 32)
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_TESSELLATION,
"Output control point count %u is invalid.",
instruction->declaration.count);
}
static void vsir_validate_dcl_output_topology(struct validation_context *ctx, static void vsir_validate_dcl_output_topology(struct validation_context *ctx,
const struct vkd3d_shader_instruction *instruction) const struct vkd3d_shader_instruction *instruction)
{ {
@ -6478,28 +6487,29 @@ 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_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},
[VKD3DSIH_DCL_OUTPUT_TOPOLOGY] = {0, 0, vsir_validate_dcl_output_topology}, [VKD3DSIH_DCL_OUTPUT_CONTROL_POINT_COUNT] = {0, 0, vsir_validate_dcl_output_control_point_count},
[VKD3DSIH_DCL_TEMPS] = {0, 0, vsir_validate_dcl_temps}, [VKD3DSIH_DCL_OUTPUT_TOPOLOGY] = {0, 0, vsir_validate_dcl_output_topology},
[VKD3DSIH_DCL_VERTICES_OUT] = {0, 0, vsir_validate_dcl_vertices_out}, [VKD3DSIH_DCL_TEMPS] = {0, 0, vsir_validate_dcl_temps},
[VKD3DSIH_ELSE] = {0, 0, vsir_validate_else}, [VKD3DSIH_DCL_VERTICES_OUT] = {0, 0, vsir_validate_dcl_vertices_out},
[VKD3DSIH_ENDIF] = {0, 0, vsir_validate_endif}, [VKD3DSIH_ELSE] = {0, 0, vsir_validate_else},
[VKD3DSIH_ENDLOOP] = {0, 0, vsir_validate_endloop}, [VKD3DSIH_ENDIF] = {0, 0, vsir_validate_endif},
[VKD3DSIH_ENDREP] = {0, 0, vsir_validate_endrep}, [VKD3DSIH_ENDLOOP] = {0, 0, vsir_validate_endloop},
[VKD3DSIH_ENDSWITCH] = {0, 0, vsir_validate_endswitch}, [VKD3DSIH_ENDREP] = {0, 0, vsir_validate_endrep},
[VKD3DSIH_IF] = {0, 1, vsir_validate_if}, [VKD3DSIH_ENDSWITCH] = {0, 0, vsir_validate_endswitch},
[VKD3DSIH_IFC] = {0, 2, vsir_validate_ifc}, [VKD3DSIH_IF] = {0, 1, vsir_validate_if},
[VKD3DSIH_LABEL] = {0, 1, vsir_validate_label}, [VKD3DSIH_IFC] = {0, 2, vsir_validate_ifc},
[VKD3DSIH_LOOP] = {0, ~0u, vsir_validate_loop}, [VKD3DSIH_LABEL] = {0, 1, vsir_validate_label},
[VKD3DSIH_NOP] = {0, 0, vsir_validate_nop}, [VKD3DSIH_LOOP] = {0, ~0u, vsir_validate_loop},
[VKD3DSIH_PHI] = {1, ~0u, vsir_validate_phi}, [VKD3DSIH_NOP] = {0, 0, vsir_validate_nop},
[VKD3DSIH_REP] = {0, 1, vsir_validate_rep}, [VKD3DSIH_PHI] = {1, ~0u, vsir_validate_phi},
[VKD3DSIH_RET] = {0, 0, vsir_validate_ret}, [VKD3DSIH_REP] = {0, 1, vsir_validate_rep},
[VKD3DSIH_SWITCH] = {0, 1, vsir_validate_switch}, [VKD3DSIH_RET] = {0, 0, vsir_validate_ret},
[VKD3DSIH_SWITCH_MONOLITHIC] = {0, ~0u, vsir_validate_switch_monolithic}, [VKD3DSIH_SWITCH] = {0, 1, vsir_validate_switch},
[VKD3DSIH_SWITCH_MONOLITHIC] = {0, ~0u, vsir_validate_switch_monolithic},
}; };
static void vsir_validate_instruction(struct validation_context *ctx) static void vsir_validate_instruction(struct validation_context *ctx)
@ -6542,12 +6552,6 @@ static void vsir_validate_instruction(struct validation_context *ctx)
ctx->dcl_temps_found = false; ctx->dcl_temps_found = false;
return; return;
case VKD3DSIH_DCL_OUTPUT_CONTROL_POINT_COUNT:
if (!instruction->declaration.count || instruction->declaration.count > 32)
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_TESSELLATION, "Output control point count %u is invalid.",
instruction->declaration.count);
return;
case VKD3DSIH_DCL_TESSELLATOR_DOMAIN: case VKD3DSIH_DCL_TESSELLATOR_DOMAIN:
if (instruction->declaration.tessellator_domain == VKD3D_TESSELLATOR_DOMAIN_INVALID if (instruction->declaration.tessellator_domain == VKD3D_TESSELLATOR_DOMAIN_INVALID
|| instruction->declaration.tessellator_domain >= VKD3D_TESSELLATOR_DOMAIN_COUNT) || instruction->declaration.tessellator_domain >= VKD3D_TESSELLATOR_DOMAIN_COUNT)