wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-12-15 08:03:30 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/ir: Require signed operands for IMAX instructions.

Browse Source
This commit is contained in:
Henri Verbeet
2025-09-02 22:01:26 +02:00
parent 6e8192e198
commit 8eebc71c13
Notes: Henri Verbeet 2025-09-18 11:44:24 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1733
4 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libs/vkd3d-shader/dxil.c
View File

@@ -4975,8 +4975,11 @@ static void sm6_parser_emit_dx_unary(struct sm6_parser *sm6, enum dx_intrinsic_o
instruction_dst_param_init_ssa_scalar(ins, 0, sm6);
}
static enum vkd3d_shader_opcode map_dx_binary_op(enum dx_intrinsic_opcode op, const struct sm6_type *type)
static enum vkd3d_shader_opcode map_dx_binary_op(enum dx_intrinsic_opcode op,
const struct sm6_type *type, uint32_t *type_flags)
{
*type_flags = 0;
switch (op)
{
case DX_FMAX:
@@ -4984,6 +4987,7 @@ static enum vkd3d_shader_opcode map_dx_binary_op(enum dx_intrinsic_opcode op, co
case DX_FMIN:
return type->u.width == 64 ? VSIR_OP_DMIN : VSIR_OP_MIN;
case DX_IMAX:
*type_flags |= DXIL_TYPE_SIGNED;
return VSIR_OP_IMAX;
case DX_IMIN:
return VSIR_OP_IMIN;
@@ -5005,14 +5009,15 @@ static void sm6_parser_emit_dx_binary(struct sm6_parser *sm6, enum dx_intrinsic_
{
struct vkd3d_shader_instruction *ins = state->ins;
struct vkd3d_shader_src_param *src_params;
uint32_t type_flags;
vsir_instruction_init(ins, &sm6->p.location, map_dx_binary_op(op, operands[0]->type));
vsir_instruction_init(ins, &sm6->p.location, map_dx_binary_op(op, operands[0]->type, &type_flags));
if (!(src_params = instruction_src_params_alloc(ins, 2, sm6)))
return;
src_param_init_from_value(&src_params[0], operands[0], 0, sm6);
src_param_init_from_value(&src_params[1], operands[1], 0, sm6);
src_param_init_from_value(&src_params[0], operands[0], type_flags, sm6);
src_param_init_from_value(&src_params[1], operands[1], type_flags, sm6);
instruction_dst_param_init_ssa_scalar(ins, 0, sm6);
instruction_dst_param_init_ssa_scalar(ins, type_flags, sm6);
}
static enum vkd3d_shader_opcode map_dx_atomic_binop(const struct sm6_value *operand, struct sm6_parser *sm6)

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

@@ -11307,6 +11307,18 @@ static void vsir_validate_integer_elementwise_operation(struct validation_contex
vsir_validate_elementwise_operation(ctx, instruction, types);
}
static void vsir_validate_signed_integer_elementwise_operation(struct validation_context *ctx,
const struct vkd3d_shader_instruction *instruction)
{
static const bool types[VSIR_DATA_TYPE_COUNT] =
{
[VSIR_DATA_I32] = true,
[VSIR_DATA_I64] = true,
};
vsir_validate_elementwise_operation(ctx, instruction, types);
}
static void vsir_validate_logic_elementwise_operation(struct validation_context *ctx,
const struct vkd3d_shader_instruction *instruction)
{
@@ -12385,7 +12397,7 @@ static const struct vsir_validator_instruction_desc vsir_validator_instructions[
[VSIR_OP_IGE] = {1, 2, vsir_validate_signed_integer_comparison_operation},
[VSIR_OP_ILT] = {1, 2, vsir_validate_signed_integer_comparison_operation},
[VSIR_OP_IMAD] = {1, 3, vsir_validate_integer_elementwise_operation},
[VSIR_OP_IMAX] = {1, 2, vsir_validate_integer_elementwise_operation},
[VSIR_OP_IMAX] = {1, 2, vsir_validate_signed_integer_elementwise_operation},
[VSIR_OP_IMIN] = {1, 2, vsir_validate_integer_elementwise_operation},
[VSIR_OP_INE] = {1, 2, vsir_validate_integer_comparison_operation},
[VSIR_OP_INEG] = {1, 1, vsir_validate_integer_elementwise_operation},