October 2020 - Wine-Commits

Zebediah Figura : tests: Import vector indexing tests from Wine.
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: vkd3d Branch: master Commit: fd9a568b8ae975ca4cb261ae00294112ed7613d3 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=fd9a568b8ae975ca4cb261a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Sep 30 21:01:22 2020 -0500 tests: Import vector indexing tests from Wine. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 6 ++++++ tests/hlsl-vector-indexing-uniform.shader_test | 16 ++++++++++++++++ tests/hlsl-vector-indexing.shader_test | 14 ++++++++++++++ tests/shader_runner_d3d12.c | 15 +++++++++++++++ 4 files changed, 51 insertions(+) diff --git a/Makefile.am b/Makefile.am index bb69078..27bc00b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -50,6 +50,9 @@ vkd3d_shader_runners = \ tests/shader_runner_d3d12 vkd3d_shader_tests = \ + tests/conditional.shader_test \ + tests/hlsl-vector-indexing.shader_test \ + tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ tests/swizzle-0.shader_test \ tests/swizzle-1.shader_test \ @@ -178,6 +181,9 @@ 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/conditional.shader_test \ + tests/hlsl-vector-indexing.shader_test \ + tests/hlsl-vector-indexing-uniform.shader_test \ tests/math.shader_test \ tests/swizzle-0.shader_test \ tests/swizzle-1.shader_test \ diff --git a/tests/hlsl-vector-indexing-uniform.shader_test b/tests/hlsl-vector-indexing-uniform.shader_test new file mode 100644 index 0000000..2556b58 --- /dev/null +++ b/tests/hlsl-vector-indexing-uniform.shader_test @@ -0,0 +1,16 @@ +# Use a uniform to prevent the compiler from optimizing. + +[pixel shader] +uniform int i; +float4 main() : SV_TARGET +{ + float4 color = float4(0.5, 0.4, 0.3, 0.2); + color.g = color[i]; + color.b = 0.8; + return color; +} + +[test] +uniform 0 uint 2 +draw quad +probe all rgba (0.5, 0.3, 0.8, 0.2) diff --git a/tests/hlsl-vector-indexing.shader_test b/tests/hlsl-vector-indexing.shader_test new file mode 100644 index 0000000..b641d7f --- /dev/null +++ b/tests/hlsl-vector-indexing.shader_test @@ -0,0 +1,14 @@ +[pixel shader] +float4 main() : SV_TARGET +{ + float4 color; + color[0] = 0.020; + color[1] = 0.245; + color[2] = 0.351; + color[3] = 1.0; + return color; +} + +[test] +draw quad +probe all rgba (0.02, 0.245, 0.351, 1.0) diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index e429d38..709fc00 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -211,6 +211,18 @@ static void parse_test_directive(struct shader_context *context, const char *lin } memcpy(context->uniforms + offset, &v, sizeof(v)); } + else if (match_string(line, "uint", &line)) + { + unsigned int u; + + sscanf(line, "%u", &u); + 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, &u, sizeof(u)); + } } else { @@ -271,6 +283,9 @@ START_TEST(shader_runner_d3d12) while (fgets(line, sizeof(line), f)) { + if (line[0] == '\n') + continue; + if (line[0] == '[') { switch (state)

1 0

Zebediah Figura : tests: Import HLSL conditional tests from Wine.
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: vkd3d Branch: master Commit: b64b3040612b3ba314900398710996d1c198a391 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b64b3040612b3ba31490039… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Sep 30 21:01:21 2020 -0500 tests: Import HLSL conditional tests from Wine. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/conditional.shader_test | 13 +++++++++++ tests/d3d12_test_utils.h | 51 ++++++++++++++++++++++++++----------------- tests/shader_runner_d3d12.c | 25 +++++++++++++++++++++ 3 files changed, 69 insertions(+), 20 deletions(-) diff --git a/tests/conditional.shader_test b/tests/conditional.shader_test new file mode 100644 index 0000000..70718f1 --- /dev/null +++ b/tests/conditional.shader_test @@ -0,0 +1,13 @@ +[pixel shader] +float4 main(float4 pos : SV_POSITION) : SV_TARGET +{ + if(pos.x > 200.0) + return float4(0.1, 0.2, 0.3, 0.4); + else + return float4(0.9, 0.8, 0.7, 0.6); +} + +[test] +draw quad +probe rect rgba (0, 0, 200, 480) (0.9, 0.8, 0.7, 0.6) +probe rect rgba (200, 0, 440, 480) (0.1, 0.2, 0.3, 0.4) diff --git a/tests/d3d12_test_utils.h b/tests/d3d12_test_utils.h index ece4896..a1e039d 100644 --- a/tests/d3d12_test_utils.h +++ b/tests/d3d12_test_utils.h @@ -585,6 +585,36 @@ static void check_readback_data_uint_(unsigned int line, struct resource_readbac ok_(line)(all_match, "Got 0x%08x, expected 0x%08x at (%u, %u, %u).\n", got, expected, x, y, z); } +#define check_readback_data_vec4(a, b, c, d) check_readback_data_vec4_(__LINE__, a, b, c, d) +static void check_readback_data_vec4_(unsigned int line, struct resource_readback *rb, + const RECT *rect, const struct vec4 *expected, unsigned int max_diff) +{ + RECT r = {0, 0, rb->width, rb->height}; + unsigned int x = 0, y = 0; + struct vec4 got = {0}; + bool all_match = true; + + if (rect) + r = *rect; + + for (y = r.top; y < r.bottom; ++y) + { + for (x = r.left; x < r.right; ++x) + { + got = *get_readback_vec4(rb, x, y); + if (!compare_vec4(&got, expected, max_diff)) + { + all_match = false; + break; + } + } + if (!all_match) + break; + } + ok_(line)(all_match, "Got {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e} at (%u, %u).\n", + got.x, got.y, got.z, got.w, expected->x, expected->y, expected->z, expected->w, x, y); +} + #define check_sub_resource_uint(a, b, c, d, e, f) check_sub_resource_uint_(__LINE__, a, b, c, d, e, f) static inline void check_sub_resource_uint_(unsigned int line, ID3D12Resource *texture, unsigned int sub_resource_idx, ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list, @@ -603,29 +633,10 @@ static inline void check_sub_resource_vec4_(unsigned int line, ID3D12Resource *t const struct vec4 *expected, unsigned int max_diff) { struct resource_readback rb; - unsigned int x = 0, y; - bool all_match = true; - struct vec4 got = {0}; get_texture_readback_with_command_list(texture, sub_resource_idx, &rb, queue, command_list); - for (y = 0; y < rb.height; ++y) - { - for (x = 0; x < rb.width; ++x) - { - got = *get_readback_vec4(&rb, x, y); - if (!compare_vec4(&got, expected, max_diff)) - { - all_match = false; - break; - } - } - if (!all_match) - break; - } + check_readback_data_vec4_(line, &rb, NULL, expected, max_diff); release_resource_readback(&rb); - - ok_(line)(all_match, "Got {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e} at (%u, %u).\n", - got.x, got.y, got.z, got.w, expected->x, expected->y, expected->z, expected->w, x, y); } #define create_default_buffer(a, b, c, d) create_default_buffer_(__LINE__, a, b, c, d) diff --git a/tests/shader_runner_d3d12.c b/tests/shader_runner_d3d12.c index f323a54..e429d38 100644 --- a/tests/shader_runner_d3d12.c +++ b/tests/shader_runner_d3d12.c @@ -167,6 +167,29 @@ static void parse_test_directive(struct shader_context *context, const char *lin check_sub_resource_vec4(context->c.render_target, 0, context->c.queue, context->c.list, &v, ulps); reset_command_list(context->c.list, context->c.allocator); } + else if (match_string(line, "probe rect rgba", &line)) + { + unsigned int x, y, w, h, ulps; + struct resource_readback rb; + struct vec4 v; + RECT rect; + int ret; + + ret = sscanf(line, "( %u , %u , %u , %u ) ( %f , %f , %f , %f )", &x, &y, &w, &h, &v.x, &v.y, &v.z, &v.w); + if (ret < 8) + goto err; + if (ret < 9) + ulps = 0; + + get_texture_readback_with_command_list(context->c.render_target, 0, &rb, context->c.queue, context->c.list); + rect.left = x; + rect.right = x + w; + rect.top = y; + rect.bottom = y + h; + check_readback_data_vec4(&rb, &rect, &v, ulps); + release_resource_readback(&rb); + reset_command_list(context->c.list, context->c.allocator); + } else if (match_string(line, "uniform", &line)) { unsigned int offset; @@ -204,6 +227,8 @@ START_TEST(shader_runner_d3d12) { static const struct test_context_desc desc = { + .rt_width = 640, + .rt_height = 480, .no_root_signature = true, .rt_format = DXGI_FORMAT_R32G32B32A32_FLOAT, };

1 0

Zebediah Figura : tests: Introduce a custom format and parser for shader-based tests.
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: vkd3d Branch: master Commit: 68ef1de6ec19a7db2db85d4d9e732b4522918d0f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=68ef1de6ec19a7db2db85d4… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Sep 30 21:01:18 2020 -0500 tests: Introduce a custom format and parser for shader-based tests. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 18 ++- tests/.gitignore | 1 + tests/d3d12.c | 101 --------------- tests/d3d12_crosstest.h | 1 + tests/d3d12_test_utils.h | 103 ++++++++++++++- tests/shader_runner_d3d12.c | 300 ++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 417 insertions(+), 107 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=68ef1de6ec19a7db2db…

1 0

Zebediah Figura : tests: Import math tests from Wine.
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: vkd3d Branch: master Commit: 2206e0c9bbbba953161857fa771b0b7eb2b414f7 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=2206e0c9bbbba953161857f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Sep 30 21:01:20 2020 -0500 tests: Import math tests from Wine. Signed-off-by: Zebediah Figura <zfigura(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/math.shader_test | 15 +++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/Makefile.am b/Makefile.am index 958be14..bb69078 100644 --- a/Makefile.am +++ b/Makefile.am @@ -50,6 +50,7 @@ vkd3d_shader_runners = \ tests/shader_runner_d3d12 vkd3d_shader_tests = \ + tests/math.shader_test \ tests/swizzle-0.shader_test \ tests/swizzle-1.shader_test \ tests/swizzle-2.shader_test \ @@ -177,6 +178,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/math.shader_test \ tests/swizzle-0.shader_test \ tests/swizzle-1.shader_test \ tests/swizzle-2.shader_test \ diff --git a/tests/math.shader_test b/tests/math.shader_test new file mode 100644 index 0000000..2fe59a0 --- /dev/null +++ b/tests/math.shader_test @@ -0,0 +1,15 @@ +[pixel shader] +float4 main(uniform float u, uniform float v, uniform float w, uniform float x, + uniform float y, uniform float z) : SV_TARGET +{ + return float4(x * y - z / w + --u / -v, + z * x / y + w / -v, + u + v - w, + x / y / w); +} + +[test] +uniform 0 float4 2.5 0.3 0.2 0.7 +uniform 4 float4 0.1 1.5 0.0 0.0 +draw quad +probe all rgba (-12.43, 9.833333, 1.6, 35.0) 1

1 0

Zebediah Figura : tests: Import HLSL swizzle tests from Wine.
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: vkd3d Branch: master Commit: e26a0f95d6cbc14db32a0d1724a199910564b3d1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e26a0f95d6cbc14db32a0d1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Sep 30 21:01:19 2020 -0500 tests: Import HLSL swizzle tests from Wine. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- Makefile.am | 21 ++++++++++++++++++++- tests/swizzle-0.shader_test | 15 +++++++++++++++ tests/swizzle-1.shader_test | 11 +++++++++++ tests/swizzle-2.shader_test | 11 +++++++++++ tests/swizzle-3.shader_test | 14 ++++++++++++++ tests/swizzle-4.shader_test | 13 +++++++++++++ tests/swizzle-5.shader_test | 10 ++++++++++ tests/swizzle-6.shader_test | 12 ++++++++++++ tests/swizzle-7.shader_test | 11 +++++++++++ 9 files changed, 117 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 5e2ea3e..958be14 100644 --- a/Makefile.am +++ b/Makefile.am @@ -49,6 +49,16 @@ vkd3d_cross_tests = \ vkd3d_shader_runners = \ tests/shader_runner_d3d12 +vkd3d_shader_tests = \ + tests/swizzle-0.shader_test \ + tests/swizzle-1.shader_test \ + tests/swizzle-2.shader_test \ + tests/swizzle-3.shader_test \ + tests/swizzle-4.shader_test \ + tests/swizzle-5.shader_test \ + tests/swizzle-6.shader_test \ + tests/swizzle-7.shader_test + vkd3d_test_headers = \ tests/d3d12_crosstest.h \ tests/d3d12_test_utils.h @@ -159,13 +169,22 @@ TEST_EXTENSIONS = .shader_test if BUILD_TESTS check_PROGRAMS = $(vkd3d_tests) $(vkd3d_cross_tests) $(vkd3d_shader_runners) -TESTS = $(vkd3d_tests) $(vkd3d_cross_tests) +TESTS = $(vkd3d_tests) $(vkd3d_cross_tests) $(vkd3d_shader_tests) tests_d3d12_LDADD = $(LDADD) @PTHREAD_LIBS@ @VULKAN_LIBS@ tests_d3d12_invalid_usage_LDADD = $(LDADD) @VULKAN_LIBS@ tests_shader_runner_d3d12_LDADD = $(LDADD) @VULKAN_LIBS@ 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/swizzle-0.shader_test \ + tests/swizzle-1.shader_test \ + tests/swizzle-2.shader_test \ + tests/swizzle-3.shader_test \ + tests/swizzle-4.shader_test \ + tests/swizzle-5.shader_test \ + tests/swizzle-6.shader_test \ + tests/swizzle-7.shader_test endif if BUILD_DEMOS diff --git a/tests/swizzle-0.shader_test b/tests/swizzle-0.shader_test new file mode 100644 index 0000000..9be141c --- /dev/null +++ b/tests/swizzle-0.shader_test @@ -0,0 +1,15 @@ +[pixel shader] +uniform float4 color; + +float4 main() : sv_target +{ + float4 ret = color; + ret.gb = ret.ra; + ret.ra = float2(0.0101, 0.0404); + return ret; +} + +[test] +uniform 0 float4 0.0303 0.08 0.07 0.0202 +draw quad +probe all rgba (0.0101, 0.0303, 0.0202, 0.0404) diff --git a/tests/swizzle-1.shader_test b/tests/swizzle-1.shader_test new file mode 100644 index 0000000..40cdc01 --- /dev/null +++ b/tests/swizzle-1.shader_test @@ -0,0 +1,11 @@ +[pixel shader] +float4 main() : SV_target +{ + float4 ret = float4(0.1, 0.2, 0.3, 0.4); + ret.wyz.yx = float2(0.5, 0.6).yx; + return ret; +} + +[test] +draw quad +probe all rgba (0.1, 0.6, 0.3, 0.5) diff --git a/tests/swizzle-2.shader_test b/tests/swizzle-2.shader_test new file mode 100644 index 0000000..b07134c --- /dev/null +++ b/tests/swizzle-2.shader_test @@ -0,0 +1,11 @@ +[pixel shader] +float4 main() : SV_target +{ + float4 ret; + ret.zwyx = float4(0.1, 0.2, 0.3, 0.4); + return ret; +} + +[test] +draw quad +probe all rgba (0.4, 0.3, 0.1, 0.2) diff --git a/tests/swizzle-3.shader_test b/tests/swizzle-3.shader_test new file mode 100644 index 0000000..1ecf5a5 --- /dev/null +++ b/tests/swizzle-3.shader_test @@ -0,0 +1,14 @@ +[pixel shader] +float4 main() : SV_target +{ + float4 ret; + ret.yw.y = 0.1; + ret.xzy.yz.y.x = 0.2; + ret.yzwx.yzwx.wz.y = 0.3; + ret.zxy.xyz.zxy.xy.y = 0.4; + return ret; +} + +[test] +draw quad +probe all rgba (0.3, 0.2, 0.4, 0.1) diff --git a/tests/swizzle-4.shader_test b/tests/swizzle-4.shader_test new file mode 100644 index 0000000..c09fa51 --- /dev/null +++ b/tests/swizzle-4.shader_test @@ -0,0 +1,13 @@ +[pixel shader] +float4 main() : SV_target +{ + float4 ret; + ret.yxz.yx = float2(0.1, 0.2); + ret.w.x = 0.3; + ret.wzyx.zyx.yx.x = 0.4; + return ret; +} + +[test] +draw quad +probe all rgba (0.1, 0.2, 0.4, 0.3) diff --git a/tests/swizzle-5.shader_test b/tests/swizzle-5.shader_test new file mode 100644 index 0000000..5a3ee1d --- /dev/null +++ b/tests/swizzle-5.shader_test @@ -0,0 +1,10 @@ +[pixel shader] +float4 main() : SV_target +{ + float4 ret = float4(0.1, 0.2, 0.3, 0.4).ywxz.zyyz; + return ret; +} + +[test] +draw quad +probe all rgba (0.1, 0.4, 0.4, 0.1) diff --git a/tests/swizzle-6.shader_test b/tests/swizzle-6.shader_test new file mode 100644 index 0000000..04251c6 --- /dev/null +++ b/tests/swizzle-6.shader_test @@ -0,0 +1,12 @@ +[pixel shader] +float4 main() : SV_target +{ + float4 ret = float4(0.1, 0.2, 0.3, 0.4); + ret.yxwz = ret; + ret = ret.wyzx; + return ret; +} + +[test] +draw quad +probe all rgba (0.3, 0.1, 0.4, 0.2) diff --git a/tests/swizzle-7.shader_test b/tests/swizzle-7.shader_test new file mode 100644 index 0000000..15a4cd0 --- /dev/null +++ b/tests/swizzle-7.shader_test @@ -0,0 +1,11 @@ +[pixel shader] +float4 main() : SV_target +{ + float4 ret; + ret.xyzw.xyzw = float4(0.1, 0.2, 0.3, 0.4); + return ret; +} + +[test] +draw quad +probe all rgba (0.1, 0.2, 0.3, 0.4)

1 0

Zebediah Figura : vkd3d-shader: Correct an off-by-one error when comparing against ARRAY_SIZE.
by Alexandre Julliard Oct. 1, 2020

Oct. 1, 2020

Module: vkd3d Branch: master Commit: d64a42323381cb88824b374b677bdaf08e956b49 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=d64a42323381cb88824b374… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Sep 30 15:34:01 2020 -0500 vkd3d-shader: Correct an off-by-one error when comparing against ARRAY_SIZE. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/trace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 9ff18e7..a510f3a 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -520,7 +520,7 @@ static void shader_dump_resource_type(struct vkd3d_string_buffer *buffer, enum v /* VKD3D_SHADER_RESOURCE_TEXTURE_CUBEARRAY */ "texturecubearray", }; - if (type <= ARRAY_SIZE(resource_type_names)) + if (type < ARRAY_SIZE(resource_type_names)) shader_addline(buffer, "%s", resource_type_names[type]); else shader_addline(buffer, "unknown");

1 0