wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-09-12 18:50:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/ir: Use vsir_data_type_get_name() in vsir_validate_elementwise_operation().

Browse Source
This commit is contained in:
Henri Verbeet
2025-08-29 21:24:04 +02:00
parent 6e68f29fa7
commit 535837ebfe
Notes: Henri Verbeet 2025-09-04 14:11:35 +02:00 
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1711
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10821,7 +10821,7 @@ static void vsir_validate_hull_shader_phase(struct validation_context *ctx,
static void vsir_validate_elementwise_operation(struct validation_context *ctx, static void vsir_validate_elementwise_operation(struct validation_context *ctx,
const struct vkd3d_shader_instruction *instruction, const bool types[VSIR_DATA_TYPE_COUNT]) const struct vkd3d_shader_instruction *instruction, const bool types[VSIR_DATA_TYPE_COUNT])
{ {
enum vsir_data_type dst_data_type; enum vsir_data_type dst_data_type, src_data_type;
unsigned int i; unsigned int i;
if (instruction->dst_count < 1) if (instruction->dst_count < 1)
@@ -10834,16 +10834,18 @@ static void vsir_validate_elementwise_operation(struct validation_context *ctx,
if (!types[dst_data_type]) if (!types[dst_data_type])
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_DATA_TYPE, validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_DATA_TYPE,
"Invalid data type %#x for elementwise operation \"%s\" (%#x).", "Invalid data type \"%s\" (%#x) for elementwise operation \"%s\" (%#x).",
dst_data_type, vsir_opcode_get_name(instruction->opcode, "<unknown>"), instruction->opcode); vsir_data_type_get_name(dst_data_type, "<unknown>"), dst_data_type,
vsir_opcode_get_name(instruction->opcode, "<unknown>"), instruction->opcode);
for (i = 0; i < instruction->src_count; ++i) for (i = 0; i < instruction->src_count; ++i)
{ {
if (instruction->src[i].reg.data_type != dst_data_type) if ((src_data_type = instruction->src[i].reg.data_type) != dst_data_type)
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_DATA_TYPE, validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_DATA_TYPE,
"Data type %#x for operand %u doesn't match the destination data type %#x " "Data type \"%s\" (%#x) for operand %u doesn't match the destination data type \"%s\" (%#x) "
"for elementwise operation \"%s\" (%#x).", "for elementwise operation \"%s\" (%#x).",
instruction->src[i].reg.data_type, i, dst_data_type, vsir_data_type_get_name(src_data_type, "<unknown>"), src_data_type, i,
vsir_data_type_get_name(dst_data_type, "<unknown>"), dst_data_type,
vsir_opcode_get_name(instruction->opcode, "<unknown>"), instruction->opcode); vsir_opcode_get_name(instruction->opcode, "<unknown>"), instruction->opcode);
} }
} }