January 2023 - Wine-commits

Francisco Casas : tests: Test using single-component swizzles as indexes.
by Alexandre Julliard 26 Jan '23

26 Jan '23

Module: vkd3d Branch: master Commit: 524029a0624117aa7c2255f93835f643e02c57c8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/524029a0624117aa7c2255f93835f… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Jan 24 20:37:38 2023 -0300 tests: Test using single-component swizzles as indexes. Vectors cannot be used as array indexes, however, single-component swizzles (such as vec.x) can be used. This suggests that single-component swizzles should actually be scalars and not vectors of dimx = 1. It is worth noting that the use of single-component swizzles on scalars should still be allowed. --- tests/hlsl-vector-indexing.shader_test | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/tests/hlsl-vector-indexing.shader_test b/tests/hlsl-vector-indexing.shader_test index f2d20c44..a7e671b8 100644 --- a/tests/hlsl-vector-indexing.shader_test +++ b/tests/hlsl-vector-indexing.shader_test @@ -25,3 +25,27 @@ float4 main() : SV_TARGET uniform 0 float4 1.0 2.0 3.0 4.0 draw quad probe all rgba (1.0, 2.0, 2.0, 3.0) + + +[pixel shader fail] +float4 main() : SV_TARGET +{ + float4 vec = {0, 1, 2, 3}; + int1 idx = {3}; + + return vec[idx]; +} + + +[pixel shader todo] +float4 main() : SV_TARGET +{ + float4 vec = {0, 1, 2, 3}; + int2 idx = {1, 2}; + + return vec[idx.y]; +} + +[test] +todo draw quad +todo probe all rgba (2.0, 2.0, 2.0, 2.0)

1 0

Francisco Casas : tests: Test swizzles on scalar values.
by Alexandre Julliard 26 Jan '23

26 Jan '23

Module: vkd3d Branch: master Commit: 9d7ef64dc0f326cc3ace9b2f97d464e6b9f3a4ce URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/9d7ef64dc0f326cc3ace9b2f97d46… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Jan 4 19:22:37 2023 -0300 tests: Test swizzles on scalar values. --- tests/swizzles.shader_test | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/tests/swizzles.shader_test b/tests/swizzles.shader_test index caf8377e..4bc8bc87 100644 --- a/tests/swizzles.shader_test +++ b/tests/swizzles.shader_test @@ -109,3 +109,29 @@ float4 main() : SV_target [test] draw quad probe all rgba (0.1, 0.2, 0.3, 0.4) + + +[pixel shader] +float4 main() : sv_target +{ + float f = 20; + + return f.x.x; +} + +[test] +draw quad +probe all rgba (20.0, 20.0, 20.0, 20.0) + + +[pixel shader] +float4 main() : sv_target +{ + float f = 3; + + return float4(1, 2, f.x.xx); +} + +[test] +draw quad +probe all rgba (1.0, 2.0, 3.0, 3.0)

1 0

Francisco Casas : tests: Add tests for assignments to self with swizzles.
by Alexandre Julliard 26 Jan '23

26 Jan '23

Module: vkd3d Branch: master Commit: edf86b2248318c4359acc242b7d82874d3384b76 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/edf86b2248318c4359acc242b7d82… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Fri Jan 6 17:33:08 2023 -0300 tests: Add tests for assignments to self with swizzles. --- tests/swizzles.shader_test | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/tests/swizzles.shader_test b/tests/swizzles.shader_test index 4bc8bc87..c3d3343f 100644 --- a/tests/swizzles.shader_test +++ b/tests/swizzles.shader_test @@ -135,3 +135,36 @@ float4 main() : sv_target [test] draw quad probe all rgba (1.0, 2.0, 3.0, 3.0) + + +[pixel shader] +uniform float4 color; + +float4 main() : sv_target +{ + float4 ret = color; + ret.xyzw = ret.xyzw; // Assignment to self. + return ret; +} + +[test] +uniform 0 float4 1.0 2.0 3.0 4.0 +draw quad +probe all rgba (1.0, 2.0, 3.0, 4.0) + + +[pixel shader] +uniform float4 color; + +float4 main() : sv_target +{ + float4 ret = color; + ret.xyzw = ret.wxyz; // Assignment to self, shifted. + ret.xy = ret.yx; + return ret; +} + +[test] +uniform 0 float4 1.0 2.0 3.0 4.0 +draw quad +probe all rgba (1.0, 4.0, 2.0, 3.0)

1 0

Francisco Casas : vkd3d-shader/hlsl: Make single-component swizzles retrieve a scalar.
by Alexandre Julliard 26 Jan '23

26 Jan '23

Module: vkd3d Branch: master Commit: f33ca836d7a4613184fbe41df31055594a11f259 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f33ca836d7a4613184fbe41df3105… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Thu Jan 5 12:13:46 2023 -0300 vkd3d-shader/hlsl: Make single-component swizzles retrieve a scalar. --- libs/vkd3d-shader/hlsl.c | 8 ++++++-- tests/hlsl-storage-qualifiers.shader_test | 6 +++--- tests/hlsl-vector-indexing.shader_test | 6 +++--- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 01172efd..256e466a 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1164,11 +1164,15 @@ struct hlsl_ir_swizzle *hlsl_new_swizzle(struct hlsl_ctx *ctx, DWORD s, unsigned struct hlsl_ir_node *val, const struct vkd3d_shader_location *loc) { struct hlsl_ir_swizzle *swizzle; + struct hlsl_type *type; if (!(swizzle = hlsl_alloc(ctx, sizeof(*swizzle)))) return NULL; - init_node(&swizzle->node, HLSL_IR_SWIZZLE, - hlsl_get_vector_type(ctx, val->data_type->base_type, components), loc); + if (components == 1) + type = hlsl_get_scalar_type(ctx, val->data_type->base_type); + else + type = hlsl_get_vector_type(ctx, val->data_type->base_type, components); + init_node(&swizzle->node, HLSL_IR_SWIZZLE, type, loc); hlsl_src_from_node(&swizzle->val, val); swizzle->swizzle = s; return swizzle; diff --git a/tests/hlsl-storage-qualifiers.shader_test b/tests/hlsl-storage-qualifiers.shader_test index 4d17c0d7..59066c5f 100644 --- a/tests/hlsl-storage-qualifiers.shader_test +++ b/tests/hlsl-storage-qualifiers.shader_test @@ -1,4 +1,4 @@ -[pixel shader todo] +[pixel shader] void sub2(in uniform float4 i, out float4 o) { o = i; @@ -17,5 +17,5 @@ void main(in uniform float4 a, uniform float4 b, out float4 o : sv_target) [test] uniform 0 float4 0.1 0.0 0.0 0.0 uniform 4 float4 0.2 0.0 0.0 0.0 -todo draw quad -probe all rgba (0.1, 0.2, 0.3, 0.4) +draw quad +todo probe all rgba (0.1, 0.2, 0.3, 0.4) diff --git a/tests/hlsl-vector-indexing.shader_test b/tests/hlsl-vector-indexing.shader_test index a7e671b8..1542d358 100644 --- a/tests/hlsl-vector-indexing.shader_test +++ b/tests/hlsl-vector-indexing.shader_test @@ -37,7 +37,7 @@ float4 main() : SV_TARGET } -[pixel shader todo] +[pixel shader] float4 main() : SV_TARGET { float4 vec = {0, 1, 2, 3}; @@ -47,5 +47,5 @@ float4 main() : SV_TARGET } [test] -todo draw quad -todo probe all rgba (2.0, 2.0, 2.0, 2.0) +draw quad +probe all rgba (2.0, 2.0, 2.0, 2.0)

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Add a helper to write per-component unary instructions.
by Alexandre Julliard 26 Jan '23

26 Jan '23

Module: vkd3d Branch: master Commit: 335f741630ddba45887bebdff611d6ebe87a1328 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/335f741630ddba45887bebdff611d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 25 19:27:21 2023 +0300 vkd3d-shader/hlsl: Add a helper to write per-component unary instructions. --- libs/vkd3d-shader/hlsl_sm1.c | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm1.c b/libs/vkd3d-shader/hlsl_sm1.c index 5050b7a9..e299aa1b 100644 --- a/libs/vkd3d-shader/hlsl_sm1.c +++ b/libs/vkd3d-shader/hlsl_sm1.c @@ -609,12 +609,28 @@ static void write_sm1_constant(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffe write_sm1_instruction(ctx, buffer, &sm1_instr); } +static void write_sm1_per_component_unary_op(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, + const struct hlsl_ir_node *instr, D3DSHADER_INSTRUCTION_OPCODE_TYPE opcode) +{ + struct hlsl_ir_expr *expr = hlsl_ir_expr(instr); + struct hlsl_ir_node *arg1 = expr->operands[0].node; + unsigned int i; + + for (i = 0; i < instr->data_type->dimx; ++i) + { + struct hlsl_reg src = arg1->reg, dst = instr->reg; + + src.writemask = hlsl_combine_writemasks(src.writemask, 1u << i); + dst.writemask = hlsl_combine_writemasks(dst.writemask, 1u << i); + write_sm1_unary_op(ctx, buffer, opcode, &dst, &src, 0); + } +} + static void write_sm1_expr(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *buffer, const struct hlsl_ir_node *instr) { struct hlsl_ir_expr *expr = hlsl_ir_expr(instr); struct hlsl_ir_node *arg1 = expr->operands[0].node; struct hlsl_ir_node *arg2 = expr->operands[1].node; - unsigned int i; assert(instr->reg.allocated); @@ -632,15 +648,11 @@ static void write_sm1_expr(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b break; case HLSL_OP1_RCP: - case HLSL_OP1_RSQ: - for (i = 0; i < instr->data_type->dimx; ++i) - { - struct hlsl_reg src = arg1->reg, dst = instr->reg; + write_sm1_per_component_unary_op(ctx, buffer, instr, D3DSIO_RCP); + break; - src.writemask = hlsl_combine_writemasks(src.writemask, 1u << i); - dst.writemask = hlsl_combine_writemasks(dst.writemask, 1u << i); - write_sm1_unary_op(ctx, buffer, expr->op == HLSL_OP1_RCP ? D3DSIO_RCP : D3DSIO_RSQ, &dst, &src, 0); - } + case HLSL_OP1_RSQ: + write_sm1_per_component_unary_op(ctx, buffer, instr, D3DSIO_RSQ); break; case HLSL_OP2_ADD:

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Write 'exp' instructions for SM1.
by Alexandre Julliard 26 Jan '23

26 Jan '23

Module: vkd3d Branch: master Commit: fa971f32bc48e39b4580abe2b7d1eb06cbfed9c7 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/fa971f32bc48e39b4580abe2b7d1e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 25 19:29:10 2023 +0300 vkd3d-shader/hlsl: Write 'exp' instructions for SM1. --- libs/vkd3d-shader/hlsl_sm1.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm1.c b/libs/vkd3d-shader/hlsl_sm1.c index e299aa1b..a66d4028 100644 --- a/libs/vkd3d-shader/hlsl_sm1.c +++ b/libs/vkd3d-shader/hlsl_sm1.c @@ -643,6 +643,10 @@ static void write_sm1_expr(struct hlsl_ctx *ctx, struct vkd3d_bytecode_buffer *b switch (expr->op) { + case HLSL_OP1_EXP2: + write_sm1_per_component_unary_op(ctx, buffer, instr, D3DSIO_EXP); + break; + case HLSL_OP1_NEG: write_sm1_unary_op(ctx, buffer, D3DSIO_MOV, &instr->reg, &arg1->reg, D3DSPSM_NEG); break;

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Support exp2() intrinsic.
by Alexandre Julliard 26 Jan '23

26 Jan '23

Module: vkd3d Branch: master Commit: 8ca2f65bc16af3bd2428dbaf81d1d3a0bf4e9c6e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8ca2f65bc16af3bd2428dbaf81d1d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 25 19:36:13 2023 +0300 vkd3d-shader/hlsl: Support exp2() intrinsic. --- libs/vkd3d-shader/hlsl.y | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index bca49ee6..3eee09ae 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2491,6 +2491,17 @@ static bool intrinsic_dot(struct hlsl_ctx *ctx, return !!add_binary_dot_expr(ctx, params->instrs, params->args[0], params->args[1], loc); } +static bool intrinsic_exp2(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_node *arg; + + if (!(arg = intrinsic_float_convert_arg(ctx, params, params->args[0], loc))) + return false; + + return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_EXP2, arg, loc); +} + static bool intrinsic_floor(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -2932,6 +2943,7 @@ intrinsic_functions[] = {"cos", 1, true, intrinsic_cos}, {"cross", 2, true, intrinsic_cross}, {"dot", 2, true, intrinsic_dot}, + {"exp2", 1, true, intrinsic_exp2}, {"floor", 1, true, intrinsic_floor}, {"frac", 1, true, intrinsic_frac}, {"ldexp", 2, true, intrinsic_ldexp},

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Support exp() intrinsic.
by Alexandre Julliard 26 Jan '23

26 Jan '23

Module: vkd3d Branch: master Commit: 8bb023e5af87b8dc4dfbf20174136ccbd87b9003 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8bb023e5af87b8dc4dfbf20174136… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jan 25 21:03:56 2023 +0300 vkd3d-shader/hlsl: Support exp() intrinsic. --- libs/vkd3d-shader/hlsl.y | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 3eee09ae..a4de0edd 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2491,6 +2491,26 @@ static bool intrinsic_dot(struct hlsl_ctx *ctx, return !!add_binary_dot_expr(ctx, params->instrs, params->args[0], params->args[1], loc); } +static bool intrinsic_exp(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_constant *coeff; + struct hlsl_ir_node *arg, *mul; + + if (!(arg = intrinsic_float_convert_arg(ctx, params, params->args[0], loc))) + return false; + + /* 1/ln(2) */ + if (!(coeff = hlsl_new_float_constant(ctx, 1.442695f, loc))) + return false; + list_add_tail(params->instrs, &coeff->node.entry); + + if (!(mul = add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MUL, &coeff->node, params->args[0], loc))) + return false; + + return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_EXP2, mul, loc); +} + static bool intrinsic_exp2(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -2943,6 +2963,7 @@ intrinsic_functions[] = {"cos", 1, true, intrinsic_cos}, {"cross", 2, true, intrinsic_cross}, {"dot", 2, true, intrinsic_dot}, + {"exp", 1, true, intrinsic_exp}, {"exp2", 1, true, intrinsic_exp2}, {"floor", 1, true, intrinsic_floor}, {"frac", 1, true, intrinsic_frac},

1 0

Nikolay Sivov : vkd3d-shader/tests: Add some exp()/exp2() tests.
by Alexandre Julliard 26 Jan '23

26 Jan '23

Module: vkd3d Branch: master Commit: ec00782eaee51e6c84a704aa32c10e17654a9d82 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ec00782eaee51e6c84a704aa32c10… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 26 13:51:57 2023 +0300 vkd3d-shader/tests: Add some exp()/exp2() tests. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Makefile.am | 1 + tests/exp.shader_test | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/Makefile.am b/Makefile.am index 0b4c2a55..a2625a5c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -59,6 +59,7 @@ vkd3d_shader_tests = \ tests/cbuffer.shader_test \ tests/compute.shader_test \ tests/conditional.shader_test \ + tests/exp.shader_test \ tests/floor.shader_test \ tests/frac.shader_test \ tests/hlsl-array-dimension.shader_test \ diff --git a/tests/exp.shader_test b/tests/exp.shader_test new file mode 100644 index 00000000..de3be685 --- /dev/null +++ b/tests/exp.shader_test @@ -0,0 +1,25 @@ +[pixel shader] +uniform float4 f; + +float4 main() : sv_target +{ + return exp2(f); +} + +[test] +uniform 0 float4 -1.0 0.0 1.0 2.0 +draw quad +probe all rgba (0.5, 1.0, 2.0, 4.0) 1 + +[pixel shader] +uniform float4 f; + +float4 main() : sv_target +{ + return exp(f); +} + +[test] +uniform 0 float4 -1.0 0.0 1.0 2.0 +draw quad +probe all rgba (0.36787948, 1.0, 2.7182815, 7.38905573) 2

1 0

Philip Rebohle : include: Fix incorrect UpdateTileMappings declaration.
by Alexandre Julliard 26 Jan '23

26 Jan '23

Module: vkd3d Branch: master Commit: f9e7cb6345785530ee0c6316fc6228bd1f5d66b0 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f9e7cb6345785530ee0c6316fc622… Author: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Date: Wed Apr 29 20:57:27 2020 +0200 include: Fix incorrect UpdateTileMappings declaration. Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> --- include/vkd3d_d3d12.idl | 1 + libs/vkd3d/command.c | 14 +++++--------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 394dfa50..652ffc36 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -2263,6 +2263,7 @@ interface ID3D12CommandQueue : ID3D12Pageable void UpdateTileMappings(ID3D12Resource *resource, UINT region_count, const D3D12_TILED_RESOURCE_COORDINATE *region_start_coordinates, const D3D12_TILE_REGION_SIZE *region_sizes, + ID3D12Heap *heap, UINT range_count, const D3D12_TILE_RANGE_FLAGS *range_flags, UINT *heap_range_offsets, diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index e2db84bd..14b3c8b8 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -6232,18 +6232,14 @@ static struct vkd3d_cs_op_data *d3d12_command_queue_require_space_locked(struct static void STDMETHODCALLTYPE d3d12_command_queue_UpdateTileMappings(ID3D12CommandQueue *iface, ID3D12Resource *resource, UINT region_count, - const D3D12_TILED_RESOURCE_COORDINATE *region_start_coordinates, - const D3D12_TILE_REGION_SIZE *region_sizes, - UINT range_count, - const D3D12_TILE_RANGE_FLAGS *range_flags, - UINT *heap_range_offsets, - UINT *range_tile_counts, - D3D12_TILE_MAPPING_FLAGS flags) + const D3D12_TILED_RESOURCE_COORDINATE *region_start_coordinates, const D3D12_TILE_REGION_SIZE *region_sizes, + ID3D12Heap *heap, UINT range_count, const D3D12_TILE_RANGE_FLAGS *range_flags, + UINT *heap_range_offsets, UINT *range_tile_counts, D3D12_TILE_MAPPING_FLAGS flags) { FIXME("iface %p, resource %p, region_count %u, region_start_coordinates %p, " - "region_sizes %p, range_count %u, range_flags %p, heap_range_offsets %p, " + "region_sizes %p, heap %p, range_count %u, range_flags %p, heap_range_offsets %p, " "range_tile_counts %p, flags %#x stub!\n", - iface, resource, region_count, region_start_coordinates, region_sizes, range_count, + iface, resource, region_count, region_start_coordinates, region_sizes, heap, range_count, range_flags, heap_range_offsets, range_tile_counts, flags); }

1 0