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/dxil: Implement DX intrinsic SplitDouble.

Browse Source
This commit is contained in:
Conor McCarthy 2024-01-24 14:03:30 +10:00 committed by Alexandre Julliard
parent 254e812b12
commit e6d52861e9
Notes: Alexandre Julliard 2024-02-01 23:07:09 +01:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/589
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -367,6 +367,7 @@ enum dx_intrinsic_opcode
DX_DERIV_COARSEY = 84, DX_DERIV_COARSEY = 84,
DX_DERIV_FINEX = 85, DX_DERIV_FINEX = 85,
DX_DERIV_FINEY = 86, DX_DERIV_FINEY = 86,
DX_SPLIT_DOUBLE = 102,
DX_LEGACY_F32TOF16 = 130, DX_LEGACY_F32TOF16 = 130,
DX_LEGACY_F16TOF32 = 131, DX_LEGACY_F16TOF32 = 131,
DX_RAW_BUFFER_LOAD = 139, DX_RAW_BUFFER_LOAD = 139,
@ -1732,6 +1733,11 @@ static bool sm6_type_is_f16_f32(const struct sm6_type *type)
return type->class == TYPE_CLASS_FLOAT && (type->u.width == 16 || type->u.width == 32); return type->class == TYPE_CLASS_FLOAT && (type->u.width == 16 || type->u.width == 32);
} }
static bool sm6_type_is_double(const struct sm6_type *type)
{
return type->class == TYPE_CLASS_FLOAT && type->u.width == 64;
}
static inline bool sm6_type_is_floating_point(const struct sm6_type *type) static inline bool sm6_type_is_floating_point(const struct sm6_type *type)
{ {
return type->class == TYPE_CLASS_FLOAT; return type->class == TYPE_CLASS_FLOAT;
@ -3880,6 +3886,19 @@ static void sm6_parser_emit_dx_sincos(struct sm6_parser *sm6, enum dx_intrinsic_
dst->u.reg = dst_params[index].reg; dst->u.reg = dst_params[index].reg;
} }
static void sm6_parser_emit_dx_split_double(struct sm6_parser *sm6, enum dx_intrinsic_opcode op,
const struct sm6_value **operands, struct function_emission_state *state)
{
struct vkd3d_shader_instruction *ins = state->ins;
struct vkd3d_shader_src_param *src_param;
vsir_instruction_init(ins, &sm6->p.location, VKD3DSIH_MOV);
src_param = instruction_src_params_alloc(ins, 1, sm6);
src_param_init_from_value(src_param, operands[0]);
instruction_dst_param_init_ssa_vector(ins, 2, sm6);
}
static void sm6_parser_emit_dx_store_output(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, static void sm6_parser_emit_dx_store_output(struct sm6_parser *sm6, enum dx_intrinsic_opcode op,
const struct sm6_value **operands, struct function_emission_state *state) const struct sm6_value **operands, struct function_emission_state *state)
{ {
@ -3950,9 +3969,11 @@ struct sm6_dx_opcode_info
i -> int32 i -> int32
m -> int16/32/64 m -> int16/32/64
f -> float f -> float
d -> double
e -> half/float e -> half/float
g -> half/float/double g -> half/float/double
H -> handle H -> handle
S -> splitdouble
v -> void v -> void
o -> overloaded o -> overloaded
R -> matches the return type R -> matches the return type
@ -3993,6 +4014,7 @@ static const struct sm6_dx_opcode_info sm6_dx_op_table[] =
[DX_ROUND_Z ] = {"g", "R", sm6_parser_emit_dx_unary}, [DX_ROUND_Z ] = {"g", "R", sm6_parser_emit_dx_unary},
[DX_RSQRT ] = {"g", "R", sm6_parser_emit_dx_unary}, [DX_RSQRT ] = {"g", "R", sm6_parser_emit_dx_unary},
[DX_SIN ] = {"g", "R", sm6_parser_emit_dx_sincos}, [DX_SIN ] = {"g", "R", sm6_parser_emit_dx_sincos},
[DX_SPLIT_DOUBLE ] = {"S", "d", sm6_parser_emit_dx_split_double},
[DX_SQRT ] = {"g", "R", sm6_parser_emit_dx_unary}, [DX_SQRT ] = {"g", "R", sm6_parser_emit_dx_unary},
[DX_STORE_OUTPUT ] = {"v", "ii8o", sm6_parser_emit_dx_store_output}, [DX_STORE_OUTPUT ] = {"v", "ii8o", sm6_parser_emit_dx_store_output},
[DX_TAN ] = {"g", "R", sm6_parser_emit_dx_unary}, [DX_TAN ] = {"g", "R", sm6_parser_emit_dx_unary},
@ -4029,12 +4051,16 @@ static bool sm6_parser_validate_operand_type(struct sm6_parser *sm6, const struc
return sm6_type_is_i16_i32_i64(type); return sm6_type_is_i16_i32_i64(type);
case 'f': case 'f':
return sm6_type_is_float(type); return sm6_type_is_float(type);
case 'd':
return sm6_type_is_double(type);
case 'e': case 'e':
return sm6_type_is_f16_f32(type); return sm6_type_is_f16_f32(type);
case 'g': case 'g':
return sm6_type_is_floating_point(type); return sm6_type_is_floating_point(type);
case 'H': case 'H':
return (is_return || sm6_value_is_handle(value)) && type == sm6->handle_type; return (is_return || sm6_value_is_handle(value)) && type == sm6->handle_type;
case 'S':
return sm6_type_is_struct(type) && !strcmp(type->u.struc->name, "dx.types.splitdouble");
case 'v': case 'v':
return !type; return !type;
case 'o': case 'o':

2
tests/hlsl/cast-64-bit.shader_test
View File

@ -32,7 +32,7 @@ uint4 main() : sv_target
[test] [test]
uniform 0 double2 -4.5 8.500003814697266 uniform 0 double2 -4.5 8.500003814697266
todo draw quad todo(sm<6) draw quad
probe all rgbaui (0, 0xc0120000, 0x80000000, 0x40210000) probe all rgbaui (0, 0xc0120000, 0x80000000, 0x40210000)