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 signature element stream index.

Browse Source
This commit is contained in:
Giovanni Mascellani 2024-12-09 10:39:43 +01:00 committed by Henri Verbeet
parent db5a3197b7
commit 59a3a8e2d6
Notes: Henri Verbeet 2024-12-09 16:19:02 +01:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1306
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8054,7 +8054,7 @@ static void vsir_validate_signature_element(struct validation_context *ctx,
enum vkd3d_tessellator_domain expected_tess_domain = VKD3D_TESSELLATOR_DOMAIN_INVALID; enum vkd3d_tessellator_domain expected_tess_domain = VKD3D_TESSELLATOR_DOMAIN_INVALID;
const char *signature_type_name = signature_type_names[signature_type]; const char *signature_type_name = signature_type_names[signature_type];
const struct signature_element *element = &signature->elements[idx]; const struct signature_element *element = &signature->elements[idx];
bool integer_type = false, is_outer = false; bool integer_type = false, is_outer = false, is_gs_output;
unsigned int semantic_index_max = 0; unsigned int semantic_index_max = 0;
if (element->register_count == 0) if (element->register_count == 0)
@ -8067,6 +8067,13 @@ static void vsir_validate_signature_element(struct validation_context *ctx,
"element %u of %s signature: Invalid register index %u and count %u.", "element %u of %s signature: Invalid register index %u and count %u.",
idx, signature_type_name, element->register_index, element->register_count); idx, signature_type_name, element->register_index, element->register_count);
is_gs_output = ctx->program->shader_version.type == VKD3D_SHADER_TYPE_GEOMETRY
&& signature_type == SIGNATURE_TYPE_OUTPUT;
if (element->stream_index >= VKD3D_MAX_STREAM_COUNT || (element->stream_index != 0 && !is_gs_output))
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_SIGNATURE,
"element %u of %s signature: Invalid stream index %u.",
idx, signature_type_name, element->stream_index);
if (element->mask == 0 || (element->mask & ~0xf)) if (element->mask == 0 || (element->mask & ~0xf))
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_SIGNATURE, validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_SIGNATURE,
"element %u of %s signature: Invalid mask %#x.", idx, signature_type_name, element->mask); "element %u of %s signature: Invalid mask %#x.", idx, signature_type_name, element->mask);

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

@ -62,6 +62,8 @@
#define VKD3D_SHADER_COMPONENT_TYPE_COUNT (VKD3D_SHADER_COMPONENT_UINT64 + 1) #define VKD3D_SHADER_COMPONENT_TYPE_COUNT (VKD3D_SHADER_COMPONENT_UINT64 + 1)
#define VKD3D_SHADER_MINIMUM_PRECISION_COUNT (VKD3D_SHADER_MINIMUM_PRECISION_UINT_16 + 1) #define VKD3D_SHADER_MINIMUM_PRECISION_COUNT (VKD3D_SHADER_MINIMUM_PRECISION_UINT_16 + 1)
#define VKD3D_MAX_STREAM_COUNT 4
enum vkd3d_shader_error enum vkd3d_shader_error
{ {
VKD3D_SHADER_ERROR_DXBC_INVALID_SIZE = 1, VKD3D_SHADER_ERROR_DXBC_INVALID_SIZE = 1,