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: Allow source operands of shift operations to have different data types.

Browse Source
This commit is contained in:
Henri Verbeet
2025-07-23 21:19:06 +02:00
parent b3e367b099
commit 4300e6c8b5
Notes: Henri Verbeet 2025-07-28 16:38:02 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Francisco Casas (@fcasas)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1645
1 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10800,6 +10800,38 @@ static void vsir_validate_cast_operation(struct validation_context *ctx,
dst_data_type, vsir_opcode_get_name(instruction->opcode, "<unknown>"), instruction->opcode);
}
static void vsir_validate_shift_operation(struct validation_context *ctx,
const struct vkd3d_shader_instruction *instruction)
{
enum vsir_data_type data_type;
static const bool types[] =
{
[VSIR_DATA_I32] = true,
[VSIR_DATA_U32] = true,
[VSIR_DATA_U64] = true,
};
data_type = instruction->dst[0].reg.data_type;
if ((size_t)data_type >= ARRAY_SIZE(types) || !types[data_type])
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_DATA_TYPE,
"Invalid destination data type %#x for shift operation \"%s\" (%#x).",
data_type, vsir_opcode_get_name(instruction->opcode, "<unknown>"), instruction->opcode);
if (instruction->src[0].reg.data_type != data_type)
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_DATA_TYPE,
"Data type %#x for source operand 0 doesn't match destination data type %#x "
"for shift operation \"%s\" (%#x).",
instruction->src[0].reg.data_type, data_type,
vsir_opcode_get_name(instruction->opcode, "<unknown>"), instruction->opcode);
data_type = instruction->src[1].reg.data_type;
if ((size_t)data_type >= ARRAY_SIZE(types) || !types[data_type])
validator_error(ctx, VKD3D_SHADER_ERROR_VSIR_INVALID_DATA_TYPE,
"Invalid source operand 1 data type %#x for shift operation \"%s\" (%#x).",
data_type, vsir_opcode_get_name(instruction->opcode, "<unknown>"), instruction->opcode);
}
static void vsir_validate_branch(struct validation_context *ctx, const struct vkd3d_shader_instruction *instruction)
{
size_t i;
@@ -11629,8 +11661,8 @@ static const struct vsir_validator_instruction_desc vsir_validator_instructions[
[VSIR_OP_INEG] = {1, 1, vsir_validate_integer_elementwise_operation},
[VSIR_OP_IREM] = {1, 2, vsir_validate_integer_elementwise_operation},
[VSIR_OP_ISFINITE] = {1, 1, vsir_validate_float_comparison_operation},
[VSIR_OP_ISHL] = {1, 2, vsir_validate_integer_elementwise_operation},
[VSIR_OP_ISHR] = {1, 2, vsir_validate_integer_elementwise_operation},
[VSIR_OP_ISHL] = {1, 2, vsir_validate_shift_operation},
[VSIR_OP_ISHR] = {1, 2, vsir_validate_shift_operation},
[VSIR_OP_ISINF] = {1, 1, vsir_validate_float_comparison_operation},
[VSIR_OP_ISNAN] = {1, 1, vsir_validate_float_comparison_operation},
[VSIR_OP_ITOF] = {1, 1, vsir_validate_itof},