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 Unary.

Browse Source
This commit is contained in:
Conor McCarthy 2023-11-27 13:29:14 +10:00 committed by Alexandre Julliard
parent cc5e703802
commit a33a9127ca
Notes: Alexandre Julliard 2023-12-07 22:47:27 +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/497
16 changed files with 185 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -296,8 +296,28 @@ enum dx_intrinsic_opcode
{
DX_LOAD_INPUT = 4,
DX_STORE_OUTPUT = 5,
DX_EXP = 21,
DX_FRC = 22,
DX_LOG = 23,
DX_SQRT = 24,
DX_RSQRT = 25,
DX_ROUND_NE = 26,
DX_ROUND_NI = 27,
DX_ROUND_PI = 28,
DX_ROUND_Z = 29,
DX_BFREV = 30,
DX_COUNT_BITS = 31,
DX_FIRST_BIT_LO = 32,
DX_FIRST_BIT_HI = 33,
DX_FIRST_BIT_SHI = 34,
DX_CREATE_HANDLE = 57,
DX_CBUFFER_LOAD_LEGACY = 59,
DX_DERIV_COARSEX = 83,
DX_DERIV_COARSEY = 84,
DX_DERIV_FINEX = 85,
DX_DERIV_FINEY = 86,
DX_LEGACY_F32TOF16 = 130,
DX_LEGACY_F16TOF32 = 131,
};
enum dxil_cast_code
@ -1573,6 +1593,11 @@ static bool sm6_type_is_bool_i16_i32_i64(const struct sm6_type *type)
return type->class == TYPE_CLASS_INTEGER && (type->u.width == 1 || type->u.width >= 16);
}
static bool sm6_type_is_i16_i32_i64(const struct sm6_type *type)
{
return type->class == TYPE_CLASS_INTEGER && type->u.width >= 16;
}
static bool sm6_type_is_bool(const struct sm6_type *type)
{
return type->class == TYPE_CLASS_INTEGER && type->u.width == 1;
@ -1588,6 +1613,16 @@ static inline bool sm6_type_is_i32(const struct sm6_type *type)
return type->class == TYPE_CLASS_INTEGER && type->u.width == 32;
}
static bool sm6_type_is_float(const struct sm6_type *type)
{
return type->class == TYPE_CLASS_FLOAT && type->u.width == 32;
}
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);
}
static inline bool sm6_type_is_floating_point(const struct sm6_type *type)
{
return type->class == TYPE_CLASS_FLOAT;
@ -3205,6 +3240,67 @@ static void sm6_parser_emit_binop(struct sm6_parser *sm6, const struct dxil_reco
}
}
static enum vkd3d_shader_opcode map_dx_unary_op(enum dx_intrinsic_opcode op)
{
switch (op)
{
case DX_EXP:
return VKD3DSIH_EXP;
case DX_FRC:
return VKD3DSIH_FRC;
case DX_LOG:
return VKD3DSIH_LOG;
case DX_SQRT:
return VKD3DSIH_SQRT;
case DX_RSQRT:
return VKD3DSIH_RSQ;
case DX_ROUND_NE:
return VKD3DSIH_ROUND_NE;
case DX_ROUND_NI:
return VKD3DSIH_ROUND_NI;
case DX_ROUND_PI:
return VKD3DSIH_ROUND_PI;
case DX_ROUND_Z:
return VKD3DSIH_ROUND_Z;
case DX_BFREV:
return VKD3DSIH_BFREV;
case DX_COUNT_BITS:
return VKD3DSIH_COUNTBITS;
case DX_FIRST_BIT_LO:
return VKD3DSIH_FIRSTBIT_LO;
case DX_FIRST_BIT_HI:
return VKD3DSIH_FIRSTBIT_HI;
case DX_FIRST_BIT_SHI:
return VKD3DSIH_FIRSTBIT_SHI;
case DX_DERIV_COARSEX:
return VKD3DSIH_DSX_COARSE;
case DX_DERIV_COARSEY:
return VKD3DSIH_DSY_COARSE;
case DX_DERIV_FINEX:
return VKD3DSIH_DSX_FINE;
case DX_DERIV_FINEY:
return VKD3DSIH_DSY_FINE;
case DX_LEGACY_F32TOF16:
return VKD3DSIH_F32TOF16;
case DX_LEGACY_F16TOF32:
return VKD3DSIH_F16TOF32;
default:
vkd3d_unreachable();
}
}
static void sm6_parser_emit_dx_unary(struct sm6_parser *sm6, struct sm6_block *code_block,
enum dx_intrinsic_opcode op, const struct sm6_value **operands, struct vkd3d_shader_instruction *ins)
{
struct vkd3d_shader_src_param *src_param;
vsir_instruction_init(ins, &sm6->p.location, map_dx_unary_op(op));
src_param = instruction_src_params_alloc(ins, 1, sm6);
src_param_init_from_value(src_param, operands[0]);
instruction_dst_param_init_ssa_scalar(ins, sm6);
}
static void sm6_parser_emit_dx_cbuffer_load(struct sm6_parser *sm6, struct sm6_block *code_block,
enum dx_intrinsic_opcode op, const struct sm6_value **operands, struct vkd3d_shader_instruction *ins)
{
@ -3378,7 +3474,7 @@ static void sm6_parser_emit_dx_store_output(struct sm6_parser *sm6, struct sm6_b
struct sm6_dx_opcode_info
{
const char ret_type;
const char *ret_type;
const char *operand_info;
void (*handler)(struct sm6_parser *, struct sm6_block *, enum dx_intrinsic_opcode,
const struct sm6_value **, struct vkd3d_shader_instruction *);
@ -3389,16 +3485,40 @@ struct sm6_dx_opcode_info
b -> constant int1
c -> constant int8/16/32
i -> int32
m -> int16/32/64
f -> float
e -> half/float
g -> half/float/double
H -> handle
v -> void
o -> overloaded
*/
static const struct sm6_dx_opcode_info sm6_dx_op_table[] =
{
[DX_CBUFFER_LOAD_LEGACY ] = {'o', "Hi", sm6_parser_emit_dx_cbuffer_load},
[DX_CREATE_HANDLE ] = {'H', "ccib", sm6_parser_emit_dx_create_handle},
[DX_LOAD_INPUT ] = {'o', "ii8i", sm6_parser_emit_dx_load_input},
[DX_STORE_OUTPUT ] = {'v', "ii8o", sm6_parser_emit_dx_store_output},
[DX_BFREV ] = {"m0", "m", sm6_parser_emit_dx_unary},
[DX_CBUFFER_LOAD_LEGACY ] = {"o", "Hi", sm6_parser_emit_dx_cbuffer_load},
[DX_COUNT_BITS ] = {"i", "m", sm6_parser_emit_dx_unary},
[DX_CREATE_HANDLE ] = {"H", "ccib", sm6_parser_emit_dx_create_handle},
[DX_DERIV_COARSEX ] = {"e0", "e", sm6_parser_emit_dx_unary},
[DX_DERIV_COARSEY ] = {"e0", "e", sm6_parser_emit_dx_unary},
[DX_DERIV_FINEX ] = {"e0", "e", sm6_parser_emit_dx_unary},
[DX_DERIV_FINEY ] = {"e0", "e", sm6_parser_emit_dx_unary},
[DX_EXP ] = {"g0", "g", sm6_parser_emit_dx_unary},
[DX_FIRST_BIT_HI ] = {"i", "m", sm6_parser_emit_dx_unary},
[DX_FIRST_BIT_LO ] = {"i", "m", sm6_parser_emit_dx_unary},
[DX_FIRST_BIT_SHI ] = {"i", "m", sm6_parser_emit_dx_unary},
[DX_FRC ] = {"g0", "g", sm6_parser_emit_dx_unary},
[DX_LEGACY_F16TOF32 ] = {"f", "i", sm6_parser_emit_dx_unary},
[DX_LEGACY_F32TOF16 ] = {"i", "f", sm6_parser_emit_dx_unary},
[DX_LOAD_INPUT ] = {"o", "ii8i", sm6_parser_emit_dx_load_input},
[DX_LOG ] = {"g0", "g", sm6_parser_emit_dx_unary},
[DX_ROUND_NE ] = {"g0", "g", sm6_parser_emit_dx_unary},
[DX_ROUND_NI ] = {"g0", "g", sm6_parser_emit_dx_unary},
[DX_ROUND_PI ] = {"g0", "g", sm6_parser_emit_dx_unary},
[DX_ROUND_Z ] = {"g0", "g", sm6_parser_emit_dx_unary},
[DX_RSQRT ] = {"g0", "g", sm6_parser_emit_dx_unary},
[DX_SQRT ] = {"g0", "g", sm6_parser_emit_dx_unary},
[DX_STORE_OUTPUT ] = {"v", "ii8o", sm6_parser_emit_dx_store_output},
};
static bool sm6_parser_validate_operand_type(struct sm6_parser *sm6, const struct sm6_value *value, char info_type,
@ -3423,6 +3543,14 @@ static bool sm6_parser_validate_operand_type(struct sm6_parser *sm6, const struc
&& type->u.width <= 32;
case 'i':
return sm6_type_is_i32(type);
case 'm':
return sm6_type_is_i16_i32_i64(type);
case 'f':
return sm6_type_is_float(type);
case 'e':
return sm6_type_is_f16_f32(type);
case 'g':
return sm6_type_is_floating_point(type);
case 'H':
return (is_return || sm6_value_is_handle(value)) && type == sm6->handle_type;
case 'v':
@ -3436,6 +3564,17 @@ static bool sm6_parser_validate_operand_type(struct sm6_parser *sm6, const struc
}
}
static bool operand_types_match(struct sm6_value *dst, const struct sm6_value **operands, unsigned int operand_count,
char index_char)
{
unsigned int i = index_char - '0';
assert(i < 10);
if (i >= operand_count)
return false;
return dst->type == operands[i]->type;
}
static bool sm6_parser_validate_dx_op(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, const char *name,
const struct sm6_value **operands, unsigned int operand_count, struct sm6_value *dst)
{
@ -3444,7 +3583,9 @@ static bool sm6_parser_validate_dx_op(struct sm6_parser *sm6, enum dx_intrinsic_
info = &sm6_dx_op_table[op];
if (!sm6_parser_validate_operand_type(sm6, dst, info->ret_type, true))
assert(info->ret_type[0]);
if (!sm6_parser_validate_operand_type(sm6, dst, info->ret_type[0], true)
|| (info->ret_type[1] && !operand_types_match(dst, operands, operand_count, info->ret_type[1])))
{
WARN("Failed to validate return type for dx intrinsic id %u, '%s'.\n", op, name);
/* Return type validation failure is not so critical. We only need to set

6
tests/hlsl/ceil.shader_test
View File

@ -18,7 +18,7 @@ float4 main() : sv_target
[test]
uniform 0 float4 -0.5 6.5 7.5 3.4
todo(sm>=6) draw quad
draw quad
probe all rgba (0.0, 7.0, 8.0, 4.0) 4
[pixel shader]
@ -34,7 +34,7 @@ float4 main() : sv_target
[test]
uniform 0 float4 -0.5 6.5 7.5 3.4
todo(sm>=6) draw quad
draw quad
probe all rgba (7.0, 8.0, 0.0, 4.0) 4
[require]
@ -53,5 +53,5 @@ float4 main() : sv_target
[test]
uniform 0 int4 -1 6 7 3
todo(sm>=6) draw quad
draw quad
probe all rgba (6.0, 7.0, -1.0, 3.0) 4

8
tests/hlsl/ddxddy.shader_test
View File

@ -8,7 +8,7 @@ float4 main(float4 pos : sv_position) : sv_target
}
[test]
todo(sm>=6) draw quad
draw quad
probe all rgba (1.0, 1.0, 0.0, 0.0)
@ -29,7 +29,7 @@ float4 main(float4 pos : sv_position) : sv_target
}
[test]
todo(sm>=6) draw quad
draw quad
probe (10, 10) rgba (-16.0, -5.0, 3.0, 0.0)
probe (11, 10) rgba (-21.0, -5.0, 3.0, 0.0)
probe (10, 11) rgba (-13.0, -5.0, 3.0, 0.0)
@ -55,7 +55,7 @@ float4 main(float4 pos : sv_position) : sv_target
}
[test]
todo(sm>=6) draw quad
draw quad
probe (10, 10) rgba (-16.0, -5.0, 3.0, 0.0)
probe (11, 10) rgba (-21.0, -5.0, 3.0, 0.0)
probe (10, 11) rgba (-13.0, -5.0, 3.0, 0.0)
@ -74,7 +74,7 @@ float4 main(float4 pos : sv_position) : sv_target
}
[test]
todo(sm>=6) draw quad
draw quad
probe (10, 10) rgba (-0.524999976, -0.164999843, 0.104999900, 0.0) 16
probe (11, 10) rgba (-0.689999819, -0.164999843, 0.114999890, 0.0) 32
probe (10, 11) rgba (-0.420000076, -0.154999852, 0.104999900, 0.0) 32

2
tests/hlsl/distance.shader_test
View File

@ -10,7 +10,7 @@ float4 main() : sv_target
[test]
uniform 0 float4 -2.0 3.0 4.0 0.1
uniform 4 float4 2.0 -1.0 4.0 5.0
todo(sm>=6) draw quad
draw quad
probe all rgba (7.483983, 7.483983, 7.483983, 7.483983) 1
[pixel shader]

4
tests/hlsl/exp.shader_test
View File

@ -8,7 +8,7 @@ float4 main() : sv_target
[test]
uniform 0 float4 -1.0 0.0 1.0 2.0
todo(sm>=6) draw quad
draw quad
probe all rgba (0.5, 1.0, 2.0, 4.0) 2
[pixel shader]
@ -21,5 +21,5 @@ float4 main() : sv_target
[test]
uniform 0 float4 -1.0 0.0 1.0 2.0
todo(sm>=6) draw quad
draw quad
probe all rgba (0.36787948, 1.0, 2.7182815, 7.38905573) 2

6
tests/hlsl/floor.shader_test
View File

@ -18,7 +18,7 @@ float4 main() : sv_target
[test]
uniform 0 float4 -0.5 6.5 7.5 3.4
todo(sm>=6) draw quad
draw quad
probe all rgba (-1.0, 6.0, 7.0, 3.0) 4
[pixel shader]
@ -34,7 +34,7 @@ float4 main() : sv_target
[test]
uniform 0 float4 -0.5 6.5 7.5 3.4
todo(sm>=6) draw quad
draw quad
probe all rgba (6.0, 7.0, -1.0, 3.0) 4
[require]
@ -53,5 +53,5 @@ float4 main() : sv_target
[test]
uniform 0 int4 -1 6 7 3
todo(sm>=6) draw quad
draw quad
probe all rgba (6.0, 7.0, -1.0, 3.0) 4

2
tests/hlsl/frac.shader_test
View File

@ -8,5 +8,5 @@ float4 main() : sv_target
[test]
uniform 0 float4 -1.1 1.6 1.3 0.5
todo(sm>=6) draw quad
draw quad
probe all rgba (0.9, 0.6, 0.3, 0.5) 2

4
tests/hlsl/ldexp.shader_test
View File

@ -10,7 +10,7 @@ float4 main() : SV_TARGET
[test]
uniform 0 float4 2.0 3.0 4.0 5.0
uniform 4 float4 0.0 -10.0 10.0 100.0
todo(sm>=6) draw quad
draw quad
probe all rgba (2.0, 0.00292968750, 4096.0, 6.33825300e+030) 2
[require]
@ -28,7 +28,7 @@ float4 main() : SV_TARGET
[test]
uniform 0 int4 2 3 4 5
uniform 4 int4 0 -10 10 100
todo(sm>=6) draw quad
draw quad
probe all rgba (2.0, 0.00292968750, 4096.0, 6.33825300e+030) 2

6
tests/hlsl/length.shader_test
View File

@ -8,7 +8,7 @@ float4 main() : SV_TARGET
[test]
uniform 0 float4 2.0 3.0 4.0 5.0
todo(sm>=6) draw quad
draw quad
probe all rgba (7.34846926, 7.34846926, 7.34846926, 7.34846926) 1
[pixel shader]
@ -21,7 +21,7 @@ float4 main() : SV_TARGET
[test]
uniform 0 float4 2.0 3.0 4.0 0.0
todo(sm>=6) draw quad
draw quad
probe all rgba (5.38516474, 5.38516474, 5.38516474, 5.38516474) 1
[pixel shader]
@ -34,7 +34,7 @@ float4 main() : SV_TARGET
[test]
uniform 0 float4 2.0 3.0 0.0 0.0
todo(sm>=6) draw quad
draw quad
probe all rgba (3.60555124, 3.60555124, 3.60555124, 3.60555124) 1
[pixel shader]

8
tests/hlsl/lit.shader_test
View File

@ -8,17 +8,17 @@ float4 main() : sv_target
[test]
uniform 0 float4 -0.1 10.0 0.0 0.0
todo(sm>=6) draw quad
draw quad
probe all rgba (1.0, 0.0, 0.0, 1.0)
[test]
uniform 0 float4 1.2 -0.1 0.0 0.0
todo(sm>=6) draw quad
draw quad
probe all rgba (1.0, 1.2, 0.0, 1.0)
[test]
uniform 0 float4 1.2 2.0 3.0 0.0
todo(sm>=6) draw quad
draw quad
probe all rgba (1.0, 1.2, 8.0, 1.0)
[pixel shader]
@ -31,7 +31,7 @@ float4 main() : sv_target
[test]
uniform 0 float4 1.2 2.0 3.0 0.0
todo(sm>=6) draw quad
draw quad
probe all rgba (2.0, 2.4, 16.0, 2.0)
[pixel shader fail]

6
tests/hlsl/log.shader_test
View File

@ -8,7 +8,7 @@ float4 main() : sv_target
[test]
uniform 0 float4 2.0 4.0 5.0 0.4
todo(sm>=6) draw quad
draw quad
probe all rgba (1.0, 2.0, 2.32192802, -1.32192802) 1
[pixel shader]
@ -21,7 +21,7 @@ float4 main() : sv_target
[test]
uniform 0 float4 10.0 100.0 1.0 0.1
todo(sm>=6) draw quad
draw quad
probe all rgba (1.0, 2.0, 0.0, -1.0) 1
[pixel shader]
@ -34,5 +34,5 @@ float4 main() : sv_target
[test]
uniform 0 float4 3.0 10.0 1.0 0.1
todo(sm>=6) draw quad
draw quad
probe all rgba (1.0986123, 2.302585, 0.0, -2.302585) 2

4
tests/hlsl/normalize.shader_test
View File

@ -47,7 +47,7 @@ float4 main() : SV_TARGET
[test]
uniform 0 float4 2.0 0.0 0.0 0.0
todo(sm>=6) draw quad
draw quad
probe all rgba (1.0, 1.0, 1.0, 1.0)
[pixel shader]
@ -60,7 +60,7 @@ float4 main() : SV_TARGET
[test]
uniform 0 float4 2.0 0.0 0.0 0.0
todo(sm>=6) draw quad
draw quad
probe all rgba (1.0, 1.0, 1.0, 1.0)
[pixel shader fail]

2
tests/hlsl/pow.shader_test
View File

@ -8,7 +8,7 @@ float4 main() : sv_target
[test]
uniform 0 float4 0.4 0.8 2.5 2.0
todo(sm>=6) draw quad
draw quad
probe all rgba (0.512, 0.101192884, 0.64, 0.25) 4

6
tests/hlsl/round.shader_test
View File

@ -8,7 +8,7 @@ float4 main() : sv_target
[test]
uniform 0 float4 -0.4 -6.6 7.6 3.4
todo(sm>=6) draw quad
draw quad
probe all rgba (0.0, -7.0, 8.0, 3.0) 4
@ -26,7 +26,7 @@ float4 main() : sv_target
[test]
uniform 0 float4 -0.4 -6.6 7.6 3.4
todo(sm>=6) draw quad
draw quad
probe all rgba (-7.0, 8.0, 0.0, 3.0) 4
@ -42,5 +42,5 @@ float4 main() : sv_target
[test]
uniform 0 float4 -1 0 2 10
todo(sm>=6) draw quad
draw quad
probe all rgba (-1.0, 0.0, 2.0, 10.0) 4

4
tests/hlsl/sqrt.shader_test
View File

@ -8,7 +8,7 @@ float4 main() : sv_target
[test]
uniform 0 float4 1.0 9.0 32.3 46.5
todo(sm>=6) draw quad
draw quad
probe all rgba (1.0, 3.0, 5.683309, 6.819091) 1
[pixel shader]
@ -21,5 +21,5 @@ float4 main() : sv_target
[test]
uniform 0 float4 1.0 9.0 4.0 16.0
todo(sm>=6) draw quad
draw quad
probe all rgba (1.0, 0.33333333, 0.5, 0.25) 1

8
tests/hlsl/trunc.shader_test
View File

@ -8,10 +8,10 @@ float4 main() : sv_target
[test]
uniform 0 float4 -0.5 6.5 7.5 3.4
todo(sm>=6) draw quad
draw quad
probe all rgba (0.0, 6.0, 7.0, 3.0)
uniform 0 float4 -1.5 6.5 7.5 3.4
todo(sm>=6) draw quad
draw quad
probe all rgba (-1.0, 6.0, 7.0, 3.0)
[pixel shader]
@ -27,7 +27,7 @@ float4 main() : sv_target
[test]
uniform 0 float4 -0.5 6.5 7.5 3.4
todo(sm>=6) draw quad
draw quad
probe all rgba (6.0, 7.0, 0.0, 3.0)
[require]
@ -46,5 +46,5 @@ float4 main() : sv_target
[test]
uniform 0 int4 -1 6 7 3
todo(sm>=6) draw quad
draw quad
probe all rgba (6.0, 7.0, -1.0, 3.0)