wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-04-13 05:43:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/ir: Check that SSA registers are used with compatible data types.

Browse Source 
Specifically, accesses are always 32 bit or always 64 bit.
This commit is contained in:
Giovanni Mascellani 2024-01-25 14:32:01 +01:00 committed by Alexandre Julliard
parent 1f536238a8
commit edc406d297
Notes: Alexandre Julliard 2024-01-29 22:52:55 +01:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Conor McCarthy (@cmccarthy)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/603
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2718,6 +2718,7 @@ struct validation_context
struct validation_context_ssa_data struct validation_context_ssa_data
{ {
enum vsir_dimension dimension; enum vsir_dimension dimension;
enum vkd3d_data_type data_type;
size_t first_seen; size_t first_seen;
uint32_t write_mask; uint32_t write_mask;
uint32_t read_mask; uint32_t read_mask;
@ -2874,13 +2875,20 @@ static void vsir_validate_register(struct validation_context *ctx,
if (data->dimension == VSIR_DIMENSION_NONE) if (data->dimension == VSIR_DIMENSION_NONE)
{ {
data->dimension = reg->dimension; data->dimension = reg->dimension;
data->data_type = reg->data_type;
data->first_seen = ctx->instruction_idx; data->first_seen = ctx->instruction_idx;
} }
else if (data->dimension != reg->dimension) else
{ {
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_DIMENSION, "Invalid dimension %#x for a SSA register: " if (data->dimension != reg->dimension)
"it has already been seen with dimension %#x at instruction %zu.", validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_DIMENSION, "Invalid dimension %#x for a SSA register: "
reg->dimension, data->dimension, data->first_seen); "it has already been seen with dimension %#x at instruction %zu.",
reg->dimension, data->dimension, data->first_seen);
if (data_type_is_64_bit(data->data_type) != data_type_is_64_bit(reg->data_type))
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_DATA_TYPE, "Invalid data type %#x for a SSA register: "
"it has already been seen with data type %#x at instruction %zu.",
reg->data_type, data->data_type, data->first_seen);
} }
break; break;
} }