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 DCL_HS_MAX_TESSFACTOR.

Browse Source
This commit is contained in:
Giovanni Mascellani 2024-09-12 11:47:43 +02:00 committed by Henri Verbeet
parent e1c3266793
commit 0f07a2c512
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 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6197,6 +6197,17 @@ static void vsir_validate_branch(struct validation_context *ctx, const struct vk
ctx->inside_block = false;
}
static void vsir_validate_dcl_hs_max_tessfactor(struct validation_context *ctx,
const struct vkd3d_shader_instruction *instruction)
{
/* Exclude non-finite values. */
if (!(instruction->declaration.max_tessellation_factor >= 1.0f
&& instruction->declaration.max_tessellation_factor <= 64.0f))
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_TESSELLATION,
"Max tessellation factor %f is invalid.",
instruction->declaration.max_tessellation_factor);
}
static void vsir_validate_dcl_temps(struct validation_context *ctx,
const struct vkd3d_shader_instruction *instruction)
{
@ -6433,23 +6444,24 @@ struct vsir_validator_instruction_desc
static const struct vsir_validator_instruction_desc vsir_validator_instructions[] =
{
[VKD3DSIH_BRANCH] = {0, ~0u, vsir_validate_branch},
[VKD3DSIH_DCL_TEMPS] = {0, 0, vsir_validate_dcl_temps},
[VKD3DSIH_ELSE] = {0, 0, vsir_validate_else},
[VKD3DSIH_ENDIF] = {0, 0, vsir_validate_endif},
[VKD3DSIH_ENDLOOP] = {0, 0, vsir_validate_endloop},
[VKD3DSIH_ENDREP] = {0, 0, vsir_validate_endrep},
[VKD3DSIH_ENDSWITCH] = {0, 0, vsir_validate_endswitch},
[VKD3DSIH_IF] = {0, 1, vsir_validate_if},
[VKD3DSIH_IFC] = {0, 2, vsir_validate_ifc},
[VKD3DSIH_LABEL] = {0, 1, vsir_validate_label},
[VKD3DSIH_LOOP] = {0, ~0u, vsir_validate_loop},
[VKD3DSIH_NOP] = {0, 0, vsir_validate_nop},
[VKD3DSIH_PHI] = {1, ~0u, vsir_validate_phi},
[VKD3DSIH_REP] = {0, 1, vsir_validate_rep},
[VKD3DSIH_RET] = {0, 0, vsir_validate_ret},
[VKD3DSIH_SWITCH] = {0, 1, vsir_validate_switch},
[VKD3DSIH_SWITCH_MONOLITHIC] = {0, ~0u, vsir_validate_switch_monolithic},
[VKD3DSIH_BRANCH] = {0, ~0u, vsir_validate_branch},
[VKD3DSIH_DCL_HS_MAX_TESSFACTOR] = {0, 0, vsir_validate_dcl_hs_max_tessfactor},
[VKD3DSIH_DCL_TEMPS] = {0, 0, vsir_validate_dcl_temps},
[VKD3DSIH_ELSE] = {0, 0, vsir_validate_else},
[VKD3DSIH_ENDIF] = {0, 0, vsir_validate_endif},
[VKD3DSIH_ENDLOOP] = {0, 0, vsir_validate_endloop},
[VKD3DSIH_ENDREP] = {0, 0, vsir_validate_endrep},
[VKD3DSIH_ENDSWITCH] = {0, 0, vsir_validate_endswitch},
[VKD3DSIH_IF] = {0, 1, vsir_validate_if},
[VKD3DSIH_IFC] = {0, 2, vsir_validate_ifc},
[VKD3DSIH_LABEL] = {0, 1, vsir_validate_label},
[VKD3DSIH_LOOP] = {0, ~0u, vsir_validate_loop},
[VKD3DSIH_NOP] = {0, 0, vsir_validate_nop},
[VKD3DSIH_PHI] = {1, ~0u, vsir_validate_phi},
[VKD3DSIH_REP] = {0, 1, vsir_validate_rep},
[VKD3DSIH_RET] = {0, 0, vsir_validate_ret},
[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)
@ -6492,14 +6504,6 @@ static void vsir_validate_instruction(struct validation_context *ctx)
ctx->dcl_temps_found = false;
return;
case VKD3DSIH_DCL_HS_MAX_TESSFACTOR:
/* Exclude non-finite values. */
if (!(instruction->declaration.max_tessellation_factor >= 1.0f
&& instruction->declaration.max_tessellation_factor <= 64.0f))
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_TESSELLATION, "Max tessellation factor %f is invalid.",
instruction->declaration.max_tessellation_factor);
return;
case VKD3DSIH_DCL_INPUT_PRIMITIVE:
if (instruction->declaration.primitive_type.type == VKD3D_PT_UNDEFINED
|| instruction->declaration.primitive_type.type >= VKD3D_PT_COUNT)