wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/ir: Validate the allowed data type and component count for SV_Position.

Browse Source
This commit is contained in:
Giovanni Mascellani 2024-10-10 21:51:19 +02:00 committed by Henri Verbeet
parent 962ce961d4
commit 20b3a4c362
Notes: Henri Verbeet 2024-10-14 19:45:15 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1173
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6775,10 +6775,13 @@ static const struct sysval_validation_data_element
unsigned int input; unsigned int input;
unsigned int output; unsigned int output;
unsigned int patch_constant; unsigned int patch_constant;
enum vkd3d_shader_component_type data_type;
unsigned int component_count;
} }
sysval_validation_data[] = sysval_validation_data[] =
{ {
[VKD3D_SHADER_SV_POSITION] = {PS_BIT | GS_BIT | HS_BIT | DS_BIT, VS_BIT | GS_BIT | HS_BIT | DS_BIT}, [VKD3D_SHADER_SV_POSITION] = {PS_BIT | GS_BIT | HS_BIT | DS_BIT, VS_BIT | GS_BIT | HS_BIT | DS_BIT, 0,
VKD3D_SHADER_COMPONENT_FLOAT, 4},
}; };
static void vsir_validate_signature_element(struct validation_context *ctx, static void vsir_validate_signature_element(struct validation_context *ctx,
@ -6886,6 +6889,19 @@ static void vsir_validate_signature_element(struct validation_context *ctx,
"element %u of %s signature: Invalid system value semantic %#x.", "element %u of %s signature: Invalid system value semantic %#x.",
idx, signature_type_name, element->sysval_semantic); idx, signature_type_name, element->sysval_semantic);
} }
if (data->component_count != 0)
{
if (element->component_type != data->data_type)
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_SIGNATURE,
"element %u of %s signature: Invalid data type %#x for system value semantic %#x.",
idx, signature_type_name, element->component_type, element->sysval_semantic);
if (vsir_write_mask_component_count(element->mask) > data->component_count)
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_SIGNATURE,
"element %u of %s signature: Invalid mask %#x for system value semantic %#x.",
idx, signature_type_name, element->mask, element->sysval_semantic);
}
} }
switch (element->component_type) switch (element->component_type)