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 register index, for some sysvals.

Browse Source
This commit is contained in:
Giovanni Mascellani 2024-12-09 10:16:53 +01:00 committed by Henri Verbeet
parent 59a3a8e2d6
commit b6a00579a2
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
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8052,9 +8052,9 @@ static void vsir_validate_signature_element(struct validation_context *ctx,
unsigned int idx) unsigned int idx)
{ {
enum vkd3d_tessellator_domain expected_tess_domain = VKD3D_TESSELLATOR_DOMAIN_INVALID; enum vkd3d_tessellator_domain expected_tess_domain = VKD3D_TESSELLATOR_DOMAIN_INVALID;
bool integer_type = false, is_outer = false, is_gs_output, require_index = true;
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, 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)
@ -8110,6 +8110,9 @@ static void vsir_validate_signature_element(struct validation_context *ctx,
switch (element->sysval_semantic) switch (element->sysval_semantic)
{ {
case VKD3D_SHADER_SV_NONE: case VKD3D_SHADER_SV_NONE:
case VKD3D_SHADER_SV_TARGET:
break;
case VKD3D_SHADER_SV_POSITION: case VKD3D_SHADER_SV_POSITION:
case VKD3D_SHADER_SV_CLIP_DISTANCE: case VKD3D_SHADER_SV_CLIP_DISTANCE:
case VKD3D_SHADER_SV_CULL_DISTANCE: case VKD3D_SHADER_SV_CULL_DISTANCE:
@ -8120,12 +8123,12 @@ static void vsir_validate_signature_element(struct validation_context *ctx,
case VKD3D_SHADER_SV_INSTANCE_ID: case VKD3D_SHADER_SV_INSTANCE_ID:
case VKD3D_SHADER_SV_IS_FRONT_FACE: case VKD3D_SHADER_SV_IS_FRONT_FACE:
case VKD3D_SHADER_SV_SAMPLE_INDEX: case VKD3D_SHADER_SV_SAMPLE_INDEX:
case VKD3D_SHADER_SV_TARGET:
case VKD3D_SHADER_SV_DEPTH: case VKD3D_SHADER_SV_DEPTH:
case VKD3D_SHADER_SV_COVERAGE: case VKD3D_SHADER_SV_COVERAGE:
case VKD3D_SHADER_SV_DEPTH_GREATER_EQUAL: case VKD3D_SHADER_SV_DEPTH_GREATER_EQUAL:
case VKD3D_SHADER_SV_DEPTH_LESS_EQUAL: case VKD3D_SHADER_SV_DEPTH_LESS_EQUAL:
case VKD3D_SHADER_SV_STENCIL_REF: case VKD3D_SHADER_SV_STENCIL_REF:
require_index = false;
break; break;
case VKD3D_SHADER_SV_TESS_FACTOR_QUADEDGE: case VKD3D_SHADER_SV_TESS_FACTOR_QUADEDGE:
@ -8166,6 +8169,11 @@ static void vsir_validate_signature_element(struct validation_context *ctx,
break; break;
} }
if (require_index && element->register_index == UINT_MAX)
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_SIGNATURE,
"element %u of %s signature: System value semantic %#x requires a register index.",
idx, signature_type_name, element->sysval_semantic);
if (expected_tess_domain != VKD3D_TESSELLATOR_DOMAIN_INVALID) if (expected_tess_domain != VKD3D_TESSELLATOR_DOMAIN_INVALID)
{ {
if (signature_type != SIGNATURE_TYPE_PATCH_CONSTANT) if (signature_type != SIGNATURE_TYPE_PATCH_CONSTANT)