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: Validate the DCL_INDEX_RANGE instruction.

Browse Source
This commit is contained in:
Giovanni Mascellani 2024-11-11 10:57:42 +01:00 committed by Henri Verbeet
parent 38c53dca08
commit aae0a74d60
Notes: Henri Verbeet 2024-12-05 21:36:37 +01:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1301
2 changed files with 57 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8498,6 +8498,61 @@ static void vsir_validate_dcl_hs_max_tessfactor(struct validation_context *ctx,
instruction->declaration.max_tessellation_factor);
}
static void vsir_validate_dcl_index_range(struct validation_context *ctx,
const struct vkd3d_shader_instruction *instruction)
{
const struct vkd3d_shader_index_range *range = &instruction->declaration.index_range;
const struct shader_signature *signature;
unsigned int control_point_count;
bool has_control_point;
if (ctx->program->normalisation_level >= VSIR_FULLY_NORMALISED_IO)
{
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_HANDLER,
"DCL_INDEX_RANGE is not allowed with fully normalised input/output.");
return;
}
if (range->dst.modifiers != VKD3DSPDM_NONE)
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_MODIFIERS,
"Invalid modifier %#x on a DCL_INDEX_RANGE destination parameter.", range->dst.modifiers);
if (range->dst.shift != 0)
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_SHIFT,
"Invalid shift %u on a DCL_INDEX_RANGE destination parameter.", range->dst.shift);
signature = vsir_signature_from_register_type(ctx, range->dst.reg.type, &has_control_point, &control_point_count);
if (!signature)
{
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_REGISTER_TYPE,
"Invalid register type %#x in DCL_INDEX_RANGE instruction.",
range->dst.reg.type);
return;
}
if (range->dst.reg.idx_count != 1 + !!has_control_point)
{
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX_COUNT,
"Invalid index count %u in DCL_INDEX_RANGE instruction.",
range->dst.reg.idx_count);
return;
}
if (range->dst.reg.idx[0].rel_addr || (has_control_point && range->dst.reg.idx[1].rel_addr))
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX,
"Invalid relative address in DCL_INDEX_RANGE instruction.");
if (has_control_point && range->dst.reg.idx[0].offset != control_point_count)
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_INDEX,
"Invalid control point index %u in DCL_INDEX_RANGE instruction, expected %u.",
range->dst.reg.idx[0].offset, control_point_count);
if (range->register_count < 2)
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_RANGE,
"Invalid register count %u in DCL_INDEX_RANGE instruction, expected at least 2.",
range->register_count);
}
static void vsir_validate_dcl_input(struct validation_context *ctx,
const struct vkd3d_shader_instruction *instruction)
{
@ -8960,6 +9015,7 @@ static const struct vsir_validator_instruction_desc vsir_validator_instructions[
[VKD3DSIH_HS_JOIN_PHASE] = {0, 0, vsir_validate_hull_shader_phase},
[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_INDEX_RANGE] = {0, 0, vsir_validate_dcl_index_range},
[VKD3DSIH_DCL_INPUT] = {0, 0, vsir_validate_dcl_input},
[VKD3DSIH_DCL_INPUT_PRIMITIVE] = {0, 0, vsir_validate_dcl_input_primitive},
[VKD3DSIH_DCL_INPUT_PS] = {0, 0, vsir_validate_dcl_input_ps},

1
libs/vkd3d-shader/vkd3d_shader_private.h
View File

@ -248,6 +248,7 @@ enum vkd3d_shader_error
VKD3D_SHADER_ERROR_VSIR_INVALID_PARAMETER = 9020,
VKD3D_SHADER_ERROR_VSIR_MISSING_SEMANTIC = 9021,
VKD3D_SHADER_ERROR_VSIR_INVALID_SIGNATURE = 9022,
VKD3D_SHADER_ERROR_VSIR_INVALID_RANGE = 9023,
VKD3D_SHADER_WARNING_VSIR_DYNAMIC_DESCRIPTOR_ARRAY = 9300,