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 semantic index for tessellation system values.

Browse Source
This commit is contained in:
Giovanni Mascellani 2024-11-15 14:10:16 +01:00 committed by Henri Verbeet
parent 9f3bbab2f0
commit 8d8de1db10
Notes: Henri Verbeet 2024-11-21 19:36:02 +01:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1266
1 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7471,6 +7471,7 @@ static void vsir_validate_signature_element(struct validation_context *ctx,
{ {
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];
unsigned int semantic_index_max = 0;
bool integer_type = false; bool integer_type = false;
if (element->register_count == 0) if (element->register_count == 0)
@ -7523,12 +7524,6 @@ 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_TESS_FACTOR_QUADEDGE:
case VKD3D_SHADER_SV_TESS_FACTOR_QUADINT:
case VKD3D_SHADER_SV_TESS_FACTOR_TRIEDGE:
case VKD3D_SHADER_SV_TESS_FACTOR_TRIINT:
case VKD3D_SHADER_SV_TESS_FACTOR_LINEDET:
case VKD3D_SHADER_SV_TESS_FACTOR_LINEDEN:
case VKD3D_SHADER_SV_TARGET: 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:
@ -7537,6 +7532,27 @@ static void vsir_validate_signature_element(struct validation_context *ctx,
case VKD3D_SHADER_SV_STENCIL_REF: case VKD3D_SHADER_SV_STENCIL_REF:
break; break;
case VKD3D_SHADER_SV_TESS_FACTOR_QUADEDGE:
semantic_index_max = 4;
break;
case VKD3D_SHADER_SV_TESS_FACTOR_QUADINT:
semantic_index_max = 2;
break;
case VKD3D_SHADER_SV_TESS_FACTOR_TRIEDGE:
semantic_index_max = 3;
break;
case VKD3D_SHADER_SV_TESS_FACTOR_TRIINT:
semantic_index_max = 1;
break;
case VKD3D_SHADER_SV_TESS_FACTOR_LINEDET:
case VKD3D_SHADER_SV_TESS_FACTOR_LINEDEN:
semantic_index_max = 2;
break;
default: default:
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_SIGNATURE, validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_SIGNATURE,
"element %u of %s signature: Invalid system value semantic %#x.", "element %u of %s signature: Invalid system value semantic %#x.",
@ -7544,6 +7560,11 @@ static void vsir_validate_signature_element(struct validation_context *ctx,
break; break;
} }
if (semantic_index_max != 0 && element->semantic_index >= semantic_index_max)
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_SIGNATURE,
"element %u of %s signature: Invalid semantic index %u for system value semantic %#x.",
idx, signature_type_name, element->semantic_index, element->sysval_semantic);
if (element->sysval_semantic < ARRAY_SIZE(sysval_validation_data)) if (element->sysval_semantic < ARRAY_SIZE(sysval_validation_data))
{ {
const struct sysval_validation_data_element *data = &sysval_validation_data[element->sysval_semantic]; const struct sysval_validation_data_element *data = &sysval_validation_data[element->sysval_semantic];