September 2021 - Wine-Commits

Zebediah Figura : tests: Test casts to float.
by Alexandre Julliard Sept. 15, 2021

Sept. 15, 2021

Module: vkd3d Branch: master Commit: 9d1f9746b78f8307718bc1ae7050f38542f73b62 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9d1f9746b78f8307718bc1a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 9 21:11:32 2021 -0500 tests: Test casts to float. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 ++ tests/cast-to-float.shader_test | 29 +++++++++++++++++++++++++++++ tests/shader_runner_d3d12.c | 29 ++++++++++++++++++++++++++++- 3 files changed, 59 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 05d9f00..d707a26 100644 --- a/Makefile.am +++ b/Makefile.am @@ -54,6 +54,7 @@ vkd3d_shader_runners = \ tests/shader_runner_d3d12 vkd3d_shader_tests = \ + tests/cast-to-float.shader_test \ tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-bool-cast.shader_test \ @@ -266,6 +267,7 @@ tests_vkd3d_api_LDADD = libvkd3d.la @VULKAN_LIBS@ tests_vkd3d_shader_api_LDADD = libvkd3d-shader.la SHADER_TEST_LOG_COMPILER = tests/shader_runner_d3d12 XFAIL_TESTS = \ + tests/cast-to-float.shader_test \ tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-bool-cast.shader_test \ diff --git a/tests/cast-to-float.shader_test b/tests/cast-to-float.shader_test new file mode 100644 index 0000000..75822e5 --- /dev/null +++ b/tests/cast-to-float.shader_test @@ -0,0 +1,29 @@ +[pixel shader] + +float4 main(uniform int i, uniform uint u, uniform bool b, uniform half h) : sv_target +{ + return float4(((float)i) + 1.5, ((float)u) - 2.5, ((float)b) / 2, h); +} + +[test] +uniform 0 int -1 +uniform 1 uint 3 +uniform 2 int -2 +uniform 3 float 0.5 +draw quad +probe all rgba (0.5, 0.5, 0.5, 0.5) + +[pixel shader] + +float4 main() : sv_target +{ + int i = -1; + uint u = 3; + bool b = true; + half h = 0.5; + return float4(((float)i) + 1.5, ((float)u) - 2.5, ((float)b) / 2, h); +} + +[test] +draw quad +probe all rgba (0.5, 0.5, 0.5, 0.5) diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index 2221c0f..d5c0380 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -242,11 +242,38 @@ static void parse_test_directive(struct shader_context *context, const char *lin } memcpy(context->uniforms + offset, &v, sizeof(v)); } + else if (match_string(line, "float", &line)) + { + float f; + + if (sscanf(line, "%f", &f) < 1) + goto err; + if (offset + 1 > context->uniform_count) + { + context->uniform_count = offset + 1; + context->uniforms = realloc(context->uniforms, context->uniform_count * sizeof(*context->uniforms)); + } + memcpy(context->uniforms + offset, &f, sizeof(f)); + } + else if (match_string(line, "int", &line)) + { + int i; + + if (sscanf(line, "%i", &i) < 1) + goto err; + if (offset + 1 > context->uniform_count) + { + context->uniform_count = offset + 1; + context->uniforms = realloc(context->uniforms, context->uniform_count * sizeof(*context->uniforms)); + } + memcpy(context->uniforms + offset, &i, sizeof(i)); + } else if (match_string(line, "uint", &line)) { unsigned int u; - sscanf(line, "%u", &u); + if (sscanf(line, "%u", &u) < 1) + goto err; if (offset + 1 > context->uniform_count) { context->uniform_count = offset + 1;

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Write dimension for constant buffer registers.
by Alexandre Julliard Sept. 15, 2021

Sept. 15, 2021

Module: vkd3d Branch: master Commit: eeeb9a5c2af886806d108ec937ae1e78b8ee79ba URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=eeeb9a5c2af886806d108ec… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Sep 15 16:03:19 2021 +0200 vkd3d-shader/hlsl: Write dimension for constant buffer registers. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_sm4.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 855804e..f3ab104 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -613,6 +613,7 @@ static void sm4_register_from_deref(struct hlsl_ctx *ctx, struct sm4_register *r if (var->is_uniform) { reg->type = VKD3D_SM4_RT_CONSTBUFFER; + reg->dim = VKD3D_SM4_DIMENSION_VEC4; reg->idx[0] = var->buffer->reg.id; reg->idx[1] = var->buffer_offset / 4; reg->idx_count = 2;

1 0

Zebediah Figura : vkd3d-shader/hlsl: Write SM4 casts to uint.
by Alexandre Julliard Sept. 15, 2021

Sept. 15, 2021

Module: vkd3d Branch: master Commit: c53a641b265bd4b919e2d84977ffa099c881e117 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c53a641b265bd4b919e2d84… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 9 21:11:38 2021 -0500 vkd3d-shader/hlsl: Write SM4 casts to uint. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_sm4.c | 45 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 0660dd5..855804e 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1086,6 +1086,51 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, break; } + case HLSL_TYPE_UINT: + { + switch (expr->op) + { + case HLSL_OP1_CAST: + { + const struct hlsl_type *src_type = arg1->data_type; + + /* Narrowing casts need to be lowered. */ + if (src_type->dimx != expr->node.data_type->dimx) + hlsl_fixme(ctx, expr->node.loc, "SM4 narrowing cast.\n"); + + switch (src_type->base_type) + { + case HLSL_TYPE_HALF: + case HLSL_TYPE_FLOAT: + write_sm4_unary_op(buffer, VKD3D_SM4_OP_FTOU, &expr->node, arg1, 0); + break; + + case HLSL_TYPE_INT: + case HLSL_TYPE_UINT: + write_sm4_unary_op(buffer, VKD3D_SM4_OP_MOV, &expr->node, arg1, 0); + break; + + case HLSL_TYPE_BOOL: + hlsl_fixme(ctx, expr->node.loc, "SM4 cast from bool to uint.\n"); + break; + + case HLSL_TYPE_DOUBLE: + hlsl_fixme(ctx, expr->node.loc, "SM4 cast from double to uint.\n"); + break; + + default: + break; + } + break; + } + + default: + hlsl_fixme(ctx, expr->node.loc, "SM4 uint \"%s\" expression.\n", debug_hlsl_expr_op(expr->op)); + break; + } + break; + } + default: { struct vkd3d_string_buffer *string;

1 0

Zebediah Figura : vkd3d-shader/hlsl: Write SM4 casts to int.
by Alexandre Julliard Sept. 15, 2021

Sept. 15, 2021

Module: vkd3d Branch: master Commit: b08e8a917779b6e41da489056d30b301cac4f6d0 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b08e8a917779b6e41da4890… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 9 21:11:37 2021 -0500 vkd3d-shader/hlsl: Write SM4 casts to int. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_sm4.c | 45 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index ce749b6..0660dd5 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1041,6 +1041,51 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, break; } + case HLSL_TYPE_INT: + { + switch (expr->op) + { + case HLSL_OP1_CAST: + { + const struct hlsl_type *src_type = arg1->data_type; + + /* Narrowing casts need to be lowered. */ + if (src_type->dimx != expr->node.data_type->dimx) + hlsl_fixme(ctx, expr->node.loc, "Narrowing cast."); + + switch (src_type->base_type) + { + case HLSL_TYPE_HALF: + case HLSL_TYPE_FLOAT: + write_sm4_unary_op(buffer, VKD3D_SM4_OP_FTOI, &expr->node, arg1, 0); + break; + + case HLSL_TYPE_INT: + case HLSL_TYPE_UINT: + write_sm4_unary_op(buffer, VKD3D_SM4_OP_MOV, &expr->node, arg1, 0); + break; + + case HLSL_TYPE_BOOL: + hlsl_fixme(ctx, expr->node.loc, "SM4 cast from bool to int."); + break; + + case HLSL_TYPE_DOUBLE: + hlsl_fixme(ctx, expr->node.loc, "SM4 cast from double to int."); + break; + + default: + break; + } + break; + } + + default: + hlsl_fixme(ctx, expr->node.loc, "SM4 int \"%s\" expression.", debug_hlsl_expr_op(expr->op)); + break; + } + break; + } + default: { struct vkd3d_string_buffer *string;

1 0

Zebediah Figura : vkd3d-shader/hlsl: Write SM4 casts to float.
by Alexandre Julliard Sept. 15, 2021

Sept. 15, 2021

Module: vkd3d Branch: master Commit: 9d54153271ed57f815d6f2daa652f21845de8e4d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9d54153271ed57f815d6f2d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 9 21:11:36 2021 -0500 vkd3d-shader/hlsl: Write SM4 casts to float. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_sm4.c | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 160da47..ce749b6 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -981,6 +981,43 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, { switch (expr->op) { + case HLSL_OP1_CAST: + { + const struct hlsl_type *src_type = arg1->data_type; + + /* Narrowing casts need to be lowered. */ + if (src_type->dimx != expr->node.data_type->dimx) + hlsl_fixme(ctx, expr->node.loc, "Narrowing cast.\n"); + + switch (src_type->base_type) + { + case HLSL_TYPE_HALF: + case HLSL_TYPE_FLOAT: + write_sm4_unary_op(buffer, VKD3D_SM4_OP_MOV, &expr->node, arg1, 0); + break; + + case HLSL_TYPE_INT: + write_sm4_unary_op(buffer, VKD3D_SM4_OP_ITOF, &expr->node, arg1, 0); + break; + + case HLSL_TYPE_UINT: + write_sm4_unary_op(buffer, VKD3D_SM4_OP_UTOF, &expr->node, arg1, 0); + break; + + case HLSL_TYPE_BOOL: + hlsl_fixme(ctx, expr->node.loc, "Casts from bool to float are not implemented.\n"); + break; + + case HLSL_TYPE_DOUBLE: + hlsl_fixme(ctx, expr->node.loc, "Casts from double to float are not implemented.\n"); + break; + + default: + break; + } + break; + } + case HLSL_OP1_NEG: write_sm4_unary_op(buffer, VKD3D_SM4_OP_MOV, &expr->node, arg1, VKD3D_SM4_REGISTER_MODIFIER_NEGATE); break;

1 0

Zebediah Figura : tests: Test casts to half.
by Alexandre Julliard Sept. 15, 2021

Sept. 15, 2021

Module: vkd3d Branch: master Commit: 6fb5d2c11cc50487571917decd37e8b40a5bb767 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6fb5d2c11cc50487571917d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 9 21:11:33 2021 -0500 tests: Test casts to half. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 ++ tests/cast-to-half.shader_test | 29 +++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/Makefile.am b/Makefile.am index d707a26..a1b6eb3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -55,6 +55,7 @@ vkd3d_shader_runners = \ vkd3d_shader_tests = \ tests/cast-to-float.shader_test \ + tests/cast-to-half.shader_test \ tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-bool-cast.shader_test \ @@ -268,6 +269,7 @@ tests_vkd3d_shader_api_LDADD = libvkd3d-shader.la SHADER_TEST_LOG_COMPILER = tests/shader_runner_d3d12 XFAIL_TESTS = \ tests/cast-to-float.shader_test \ + tests/cast-to-half.shader_test \ tests/conditional.shader_test \ tests/hlsl-array-dimension.shader_test \ tests/hlsl-bool-cast.shader_test \ diff --git a/tests/cast-to-half.shader_test b/tests/cast-to-half.shader_test new file mode 100644 index 0000000..6db5412 --- /dev/null +++ b/tests/cast-to-half.shader_test @@ -0,0 +1,29 @@ +[pixel shader] + +float4 main(uniform int i, uniform uint u, uniform bool b, uniform float f) : sv_target +{ + return float4(((half)i) + 1.5, ((half)u) - 2.5, ((half)b) / 2, f); +} + +[test] +uniform 0 int -1 +uniform 1 uint 3 +uniform 2 int -2 +uniform 3 float 0.5 +draw quad +probe all rgba (0.5, 0.5, 0.5, 0.5) + +[pixel shader] + +float4 main() : sv_target +{ + int i = -1; + uint u = 3; + bool b = true; + float f = 0.5; + return float4(((half)i) + 1.5, ((half)u) - 2.5, ((half)b) / 2, f); +} + +[test] +draw quad +probe all rgba (0.5, 0.5, 0.5, 0.5)

1 0

Giovanni Mascellani : tests: Test the shape of the sum of two numeric values.
by Alexandre Julliard Sept. 15, 2021

Sept. 15, 2021

Module: vkd3d Branch: master Commit: d4adbe81a0db625477e616edfbc4de59bbb705f7 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d4adbe81a0db625477e616e… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Sep 15 16:00:15 2021 +0200 tests: Test the shape of the sum of two numeric values. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 2 + tests/hlsl-shape.shader_test | 355 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 357 insertions(+) diff --git a/Makefile.am b/Makefile.am index 9f747f4..a5aaa35 100644 --- a/Makefile.am +++ b/Makefile.am @@ -71,6 +71,7 @@ vkd3d_shader_tests = \ tests/hlsl-nested-arrays.shader_test \ tests/hlsl-return-implicit-conversion.shader_test \ tests/hlsl-return-void.shader_test \ + tests/hlsl-shape.shader_test \ tests/hlsl-static-initializer.shader_test \ tests/hlsl-storage-qualifiers.shader_test \ tests/hlsl-struct-assignment.shader_test \ @@ -286,6 +287,7 @@ XFAIL_TESTS = \ tests/hlsl-nested-arrays.shader_test \ tests/hlsl-return-implicit-conversion.shader_test \ tests/hlsl-return-void.shader_test \ + tests/hlsl-shape.shader_test \ tests/hlsl-static-initializer.shader_test \ tests/hlsl-storage-qualifiers.shader_test \ tests/hlsl-vector-indexing.shader_test \ diff --git a/tests/hlsl-shape.shader_test b/tests/hlsl-shape.shader_test new file mode 100644 index 0000000..b96f0fd --- /dev/null +++ b/tests/hlsl-shape.shader_test @@ -0,0 +1,355 @@ +[pixel shader] +float4 main() : sv_target +{ + float x = 1.0; + float y = 2.0; + return float4(x + y, 0.0, 0.0, 0.0); +} + +[test] +draw quad +probe all rgba (3.0, 0.0, 0.0, 0.0) + +[pixel shader] +float4 main() : sv_target +{ + float1 x = float1(1.0); + float2 y = float2(1.0, 2.0); + return float4(x + y, 0.0, 0.0); +} + +[test] +draw quad +probe all rgba (2.0, 3.0, 0.0, 0.0) + +[pixel shader] +float4 main() : sv_target +{ + float1 x = float1(1.0); + float4 y = float4(1.0, 2.0, 3.0, 4.0); + return x + y; +} + +[test] +draw quad +probe all rgba (2.0, 3.0, 4.0, 5.0) + +[pixel shader] +float4 main() : sv_target +{ + float2 x = float2(1.0, 2.0); + float4 y = float4(1.0, 2.0, 3.0, 4.0); + return float4(x + y, 0.0, 0.0); +} + +[test] +draw quad +probe all rgba (2.0, 4.0, 0.0, 0.0) + +[pixel shader] +float4 main() : sv_target +{ + float x = 1.0; + float1 y = float1(1.0); + return float4(x + y, y + x, 0.0, 0.0); +} + +[test] +draw quad +probe all rgba (2.0, 2.0, 0.0, 0.0) + +[pixel shader] +float4 main() : sv_target +{ + float x = 1.0; + float4 y = float4(1.0, 2.0, 3.0, 4.0); + return x + y; +} + +[test] +draw quad +probe all rgba (2.0, 3.0, 4.0, 5.0) + +[pixel shader] +float4 main() : sv_target +{ + float4 x = float4(1.0, 2.0, 3.0, 4.0); + float y = 1.0; + return x + y; +} + +[test] +draw quad +probe all rgba (2.0, 3.0, 4.0, 5.0) + +[pixel shader] +float4 main() : sv_target +{ + float2x2 x = float2x2(1.0, 2.0, + 3.0, 4.0); + float2x3 y = float2x3(1.0, 2.0, 3.0, + 4.0, 5.0, 6.0); + return x + y; +} + +[test] +draw quad +probe all rgba (2.0, 4.0, 7.0, 9.0) + +[pixel shader] +float4 main() : sv_target +{ + float2x3 x = float2x3(1.0, 2.0, 3.0, + 4.0, 5.0, 6.0); + float2x2 y = float2x2(1.0, 2.0, + 3.0, 4.0); + return x + y; +} + +[test] +draw quad +probe all rgba (2.0, 4.0, 7.0, 9.0) + +[pixel shader] +float4 main() : sv_target +{ + float1x4 x = float1x4(1.0, 2.0, 3.0, 4.0); + float4x4 y = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + return x + y; +} + +[test] +draw quad +probe all rgba (2.0, 4.0, 6.0, 8.0) + +[pixel shader] +float4 main() : sv_target +{ + float4x4 x = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + float1x4 y = float1x4(1.0, 2.0, 3.0, 4.0); + return x + y; +} + +[test] +draw quad +probe all rgba (2.0, 4.0, 6.0, 8.0) + +[pixel shader] +float4 main() : sv_target +{ + float4x1 x = float4x1(1.0, 2.0, 3.0, 4.0); + float4x4 y = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + return x + y; +} + +[test] +draw quad +probe all rgba (2.0, 7.0, 12.0, 17.0) + +[pixel shader] +float4 main() : sv_target +{ + float4x4 x = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + float4x1 y = float4x1(1.0, 2.0, 3.0, 4.0); + return x + y; +} + +[test] +draw quad +probe all rgba (2.0, 7.0, 12.0, 17.0) + +[pixel shader] +float4 main() : sv_target +{ + float4x4 x = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + float2x3 y = float2x3(1.0, 2.0, 3.0, + 4.0, 5.0, 6.0); + return float4((x + y)[0], 0.0); +} + +[test] +draw quad +probe all rgba (2.0, 4.0, 6.0, 0.0) + +[pixel shader] +float4 main() : sv_target +{ + float2x3 x = float2x3(1.0, 2.0, 3.0, + 4.0, 5.0, 6.0); + float4x4 y = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + return float4((x + y)[1], 0.0); +} + +[test] +draw quad +probe all rgba (9.0, 11.0, 13.0, 0.0) + +[pixel shader] +float4 main() : sv_target +{ + float4 x = float4(1.0, 2.0, 3.0, 4.0); + float1x4 y = float1x4(1.0, 2.0, 3.0, 4.0); + return x + y; +} + +[test] +draw quad +probe all rgba (2.0, 4.0, 6.0, 8.0) + +[pixel shader] +float4 main() : sv_target +{ + float1x4 x = float1x4(1.0, 2.0, 3.0, 4.0); + float4 y = float4(1.0, 2.0, 3.0, 4.0); + return x + y; +} + +[test] +draw quad +probe all rgba (2.0, 4.0, 6.0, 8.0) + +[pixel shader] +float4 main() : sv_target +{ + float4 x = float4(1.0, 2.0, 3.0, 4.0); + float4x1 y = float4x1(1.0, 2.0, 3.0, 4.0); + return x + y; +} + +[test] +draw quad +probe all rgba (2.0, 4.0, 6.0, 8.0) + +[pixel shader] +float4 main() : sv_target +{ + float4x1 x = float4x1(1.0, 2.0, 3.0, 4.0); + float4 y = float4(1.0, 2.0, 3.0, 4.0); + return x + y; +} + +[test] +draw quad +probe all rgba (2.0, 4.0, 6.0, 8.0) + +[pixel shader] +float4 main() : sv_target +{ + float4 x = float4(1.0, 2.0, 3.0, 4.0); + float2x2 y = float2x2(1.0, 2.0, + 3.0, 4.0); + return x + y; +} + +[test] +draw quad +probe all rgba (2.0, 4.0, 6.0, 8.0) + +[pixel shader] +float4 main() : sv_target +{ + float2x2 x = float2x2(1.0, 2.0, + 3.0, 4.0); + float4 y = float4(1.0, 2.0, 3.0, 4.0); + return x + y; +} + +[test] +draw quad +probe all rgba (2.0, 4.0, 6.0, 8.0) + +[pixel shader] +float4 main() : sv_target +{ + float1 x = float1(1.0); + float1x4 y = float1x4(1.0, 2.0, 3.0, 4.0); + return x + y; +} + +[test] +draw quad +probe all rgba (2.0, 3.0, 4.0, 5.0) + +[pixel shader] +float4 main() : sv_target +{ + float1x4 x = float1x4(1.0, 2.0, 3.0, 4.0); + float1 y = float1(1.0); + return x + y; +} + +[test] +draw quad +probe all rgba (2.0, 3.0, 4.0, 5.0) + +[pixel shader] +float4 main() : sv_target +{ + float2 x = float2(1.0, 2.0); + float4x1 y = float4x1(1.0, 2.0, 3.0, 4.0); + return float4(x + y, 0.0, 0.0); +} + +[test] +draw quad +probe all rgba (2.0, 4.0, 0.0, 0.0) + +[pixel shader] +float4 main() : sv_target +{ + float4x1 x = float4x1(1.0, 2.0, 3.0, 4.0); + float2 y = float2(1.0, 2.0); + return float4(x + y, 0.0, 0.0); +} + +[test] +draw quad +probe all rgba (2.0, 4.0, 0.0, 0.0) + +[pixel shader] +float4 main() : sv_target +{ + float x = 1.0; + float4x4 y = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + return (x + y)[0]; +} + +[test] +draw quad +probe all rgba (2.0, 3.0, 4.0, 5.0) + +[pixel shader] +float4 main() : sv_target +{ + float4x4 x = float4x4(1.0, 2.0, 3.0, 4.0, + 5.0, 6.0, 7.0, 8.0, + 9.0, 10.0, 11.0, 12.0, + 13.0, 14.0, 15.0, 16.0); + float y = 1.0; + return (x + y)[1]; +} + +[test] +draw quad +probe all rgba (6.0, 7.0, 8.0, 9.0)

1 0

Henri Verbeet : vkd3d-shader/glsl: Explicitly initialise "buffer" in vkd3d_glsl_generator_create().
by Alexandre Julliard Sept. 15, 2021

Sept. 15, 2021

Module: vkd3d Branch: master Commit: 77b5125fdaf3417502222ae3034f5904aff1d902 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=77b5125fdaf3417502222ae… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 15 12:35:34 2021 +0200 vkd3d-shader/glsl: Explicitly initialise "buffer" in vkd3d_glsl_generator_create(). So that we don't get in trouble if vkd3d_string_buffer_init() were to start doing more than zeroing fields. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/glsl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/glsl.c b/libs/vkd3d-shader/glsl.c index b304add..7e028d2 100644 --- a/libs/vkd3d-shader/glsl.c +++ b/libs/vkd3d-shader/glsl.c @@ -38,6 +38,7 @@ struct vkd3d_glsl_generator *vkd3d_glsl_generator_create(const struct vkd3d_shad memset(generator, 0, sizeof(*generator)); generator->version = *version; + vkd3d_string_buffer_init(&generator->buffer); generator->location.source_name = compile_info->source_name; generator->location.line = 2; /* Line 1 is the version token. */ generator->message_context = message_context;

1 0

Giovanni Mascellani : vkd3d-shader/hlsl: Write constant buffer offsets in bytes.
by Alexandre Julliard Sept. 15, 2021

Sept. 15, 2021

Module: vkd3d Branch: master Commit: 46282caf0f726fecb571385123443c653a67f07a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=46282caf0f726fecb571385… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Sep 15 16:06:13 2021 +0200 vkd3d-shader/hlsl: Write constant buffer offsets in bytes. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/hlsl_sm4.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index f3ab104..b344cf8 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -515,7 +515,7 @@ static void write_sm4_rdef(struct hlsl_ctx *ctx, struct dxbc_writer *dxbc) flags |= D3D_SVF_USED; put_u32(&buffer, 0); /* name */ - put_u32(&buffer, var->buffer_offset); + put_u32(&buffer, var->buffer_offset * sizeof(float)); put_u32(&buffer, var->data_type->reg_size * sizeof(float)); put_u32(&buffer, flags); put_u32(&buffer, 0); /* type */

1 0

Eric Pouech : dbghelp/dwarf: Properly parse line number header for DWARF4 debug info.
by Alexandre Julliard Sept. 14, 2021

Sept. 14, 2021

Module: wine Branch: master Commit: e87f3dd5b8dc6276289863cdbe4a4498fc64fa4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=e87f3dd5b8dc6276289863cd… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Sep 11 10:59:42 2021 +0200 dbghelp/dwarf: Properly parse line number header for DWARF4 debug info. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 00fa0f6fb60..098576d620f 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -2222,7 +2222,7 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, { dwarf2_traverse_context_t traverse; ULONG_PTR length; - unsigned insn_size, default_stmt; + unsigned insn_size, version, default_stmt; unsigned line_range, opcode_base; int line_base; unsigned char offset_size; @@ -2256,9 +2256,11 @@ static BOOL dwarf2_parse_line_numbers(const dwarf2_section_t* sections, WARN("out of bounds header\n"); return FALSE; } - dwarf2_parse_u2(&traverse); /* version */ + version = dwarf2_parse_u2(&traverse); dwarf2_parse_offset(&traverse, offset_size); /* header_len */ insn_size = dwarf2_parse_byte(&traverse); + if (version >= 4) + dwarf2_parse_byte(&traverse); /* max_operations_per_instructions */ default_stmt = dwarf2_parse_byte(&traverse); line_base = (signed char)dwarf2_parse_byte(&traverse); line_range = dwarf2_parse_byte(&traverse);

1 0