August 2021 - Wine-commits - list.winehq.org

Zebediah Figura : build: Use noinst_HEADERS instead of EXTRA_DIST to track demo and test headers.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: vkd3d Branch: master Commit: 6d687521d08d8a986f3aae5133820c574a711eeb URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6d687521d08d8a986f3aae5… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Aug 3 22:52:14 2021 -0500 build: Use noinst_HEADERS instead of EXTRA_DIST to track demo and test headers. 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 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 8dd803d..8cbcd26 100644 --- a/Makefile.am +++ b/Makefile.am @@ -299,7 +299,7 @@ demos_triangle_CFLAGS = $(DEMOS_CFLAGS) demos_triangle_LDADD = $(DEMOS_LDADD) endif -EXTRA_DIST += $(vkd3d_test_headers) $(vkd3d_demos_headers) +noinst_HEADERS = $(vkd3d_test_headers) $(vkd3d_demos_headers) VKD3D_V_WIDL = $(vkd3d_v_widl_(a)AM_V@) vkd3d_v_widl_ = $(vkd3d_v_widl_(a)AM_DEFAULT_V@)

1 0

Conor McCarthy : tests: Add tests for DGE and DLT instructions.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: vkd3d Branch: master Commit: f21510a9fcb3f8e820d1ef7495f5b96aa88b91de URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f21510a9fcb3f8e820d1ef7… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Aug 4 12:56:07 2021 +1000 tests: Add tests for DGE and DLT instructions. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index bb66b86..6b22580 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -9252,6 +9252,52 @@ static void test_shader_instructions(void) 0x00000000, 0x0100003e, 0x30494653, 0x00000008, 0x00000001, 0x00000000, }; static struct named_shader ps_dne = {"dne", ps_dne_code, sizeof(ps_dne_code)}; + static const DWORD ps_dge_code[] = + { +#if 0 + double2 src0; + + void main(out uint4 dst : SV_Target) + { + dst = (uint4)0; + if (src0.x >= src0.y) + dst.x = 0xffffffff; + } +#endif + 0x43425844, 0xad9e15a9, 0x80ed9af5, 0x039e7dbd, 0xac8b1634, 0x00000001, 0x00000118, 0x00000004, + 0x00000030, 0x00000040, 0x00000074, 0x00000108, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x0000008c, 0x00000050, + 0x00000023, 0x0100186a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, + 0x00000000, 0x02000068, 0x00000001, 0x090000c4, 0x00100012, 0x00000000, 0x00208446, 0x00000000, + 0x00000000, 0x00208ee6, 0x00000000, 0x00000000, 0x05000036, 0x00102012, 0x00000000, 0x0010000a, + 0x00000000, 0x08000036, 0x001020e2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x0100003e, 0x30494653, 0x00000008, 0x00000001, 0x00000000, + }; + static struct named_shader ps_dge = {"dge", ps_dge_code, sizeof(ps_dge_code)}; + static const DWORD ps_dlt_code[] = + { +#if 0 + double2 src0; + + void main(out uint4 dst : SV_Target) + { + dst = (uint4)0; + if (src0.x < src0.y) + dst.x = 0xffffffff; + } +#endif + 0x43425844, 0xc42b9ef5, 0xd24453bd, 0xc6bc7933, 0x1ba2cbcd, 0x00000001, 0x00000118, 0x00000004, + 0x00000030, 0x00000040, 0x00000074, 0x00000108, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x0000008c, 0x00000050, + 0x00000023, 0x0100186a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, + 0x00000000, 0x02000068, 0x00000001, 0x090000c5, 0x00100012, 0x00000000, 0x00208446, 0x00000000, + 0x00000000, 0x00208ee6, 0x00000000, 0x00000000, 0x05000036, 0x00102012, 0x00000000, 0x0010000a, + 0x00000000, 0x08000036, 0x001020e2, 0x00000000, 0x00004002, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x0100003e, 0x30494653, 0x00000008, 0x00000001, 0x00000000, + }; + static struct named_shader ps_dlt = {"dlt", ps_dlt_code, sizeof(ps_dlt_code)}; static const DWORD ps_dtou_code[] = { #if 0 @@ -9898,6 +9944,11 @@ static void test_shader_instructions(void) {&ps_deq, {.d = {{1.0, 0.0}}}, {{0x00000000}}, true}, {&ps_dne, {.d = {{0.0, 0.0}}}, {{0x00000000}}, true, true}, {&ps_dne, {.d = {{1.0, 0.0}}}, {{0xffffffff}}, true, true}, + {&ps_dge, {.d = {{0.0, 1.0}}}, {{0x00000000}}, true, true}, + {&ps_dge, {.d = {{1.0, 1.0}}}, {{0xffffffff}}, true, true}, + {&ps_dge, {.d = {{1.5, 1.0}}}, {{0xffffffff}}, true, true}, + {&ps_dlt, {.d = {{0.0, 1.0}}}, {{0xffffffff}}, true, true}, + {&ps_dlt, {.d = {{1.0, 1.0}}}, {{0x00000000}}, true, true}, {&ps_dtou, {.d = {{ -NAN}}}, {{ 0, 0 }}, true, true}, {&ps_dtou, {.d = {{ NAN}}}, {{ 0, 0 }}, true, true}, {&ps_dtou, {.d = {{-INFINITY}}}, {{ 0, ~0u}}, true, true},

1 0

Conor McCarthy : vkd3d-shader: Implement DGE instruction.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: vkd3d Branch: master Commit: df60cffef1807dcd20f6c41d4f14086e51c5791a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=df60cffef1807dcd20f6c41… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Aug 4 12:56:08 2021 +1000 vkd3d-shader: Implement DGE instruction. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 2 ++ libs/vkd3d-shader/spirv.c | 2 ++ libs/vkd3d-shader/trace.c | 1 + libs/vkd3d-shader/vkd3d_shader_private.h | 1 + tests/d3d12.c | 6 +++--- 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 2691125..afeebb2 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -312,6 +312,7 @@ enum vkd3d_sm4_opcode VKD3D_SM5_OP_SYNC = 0xbe, VKD3D_SM5_OP_DADD = 0xbf, VKD3D_SM5_OP_DEQ = 0xc3, + VKD3D_SM5_OP_DGE = 0xc4, VKD3D_SM5_OP_DMOV = 0xc7, VKD3D_SM5_OP_EVAL_SAMPLE_INDEX = 0xcc, VKD3D_SM5_OP_EVAL_CENTROID = 0xcd, @@ -1254,6 +1255,7 @@ static const struct vkd3d_sm4_opcode_info opcode_table[] = shader_sm5_read_sync}, {VKD3D_SM5_OP_DADD, VKD3DSIH_DADD, "d", "dd"}, {VKD3D_SM5_OP_DEQ, VKD3DSIH_DEQ, "u", "dd"}, + {VKD3D_SM5_OP_DGE, VKD3DSIH_DGE, "u", "dd"}, {VKD3D_SM5_OP_DMOV, VKD3DSIH_DMOV, "d", "d"}, {VKD3D_SM5_OP_EVAL_SAMPLE_INDEX, VKD3DSIH_EVAL_SAMPLE_INDEX, "f", "fi"}, {VKD3D_SM5_OP_EVAL_CENTROID, VKD3DSIH_EVAL_CENTROID, "f", "f"}, diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index a1f061c..eb63e82 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -7355,6 +7355,7 @@ static void vkd3d_dxbc_compiler_emit_comparison_instruction(struct vkd3d_dxbc_co { case VKD3DSIH_DEQ: case VKD3DSIH_EQ: op = SpvOpFOrdEqual; break; + case VKD3DSIH_DGE: case VKD3DSIH_GE: op = SpvOpFOrdGreaterThanEqual; break; case VKD3DSIH_IEQ: op = SpvOpIEqual; break; case VKD3DSIH_IGE: op = SpvOpSGreaterThanEqual; break; @@ -9571,6 +9572,7 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, vkd3d_dxbc_compiler_emit_udiv(compiler, instruction); break; case VKD3DSIH_DEQ: + case VKD3DSIH_DGE: case VKD3DSIH_EQ: case VKD3DSIH_GE: case VKD3DSIH_IEQ: diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 592befe..ee4ebb1 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -105,6 +105,7 @@ static const char * const shader_opcode_names[] = /* VKD3DSIH_DEFB */ "defb", /* VKD3DSIH_DEFI */ "defi", /* VKD3DSIH_DEQ */ "deq", + /* VKD3DSIH_DGE */ "dge", /* VKD3DSIH_DIV */ "div", /* VKD3DSIH_DMOV */ "dmov", /* VKD3DSIH_DP2 */ "dp2", diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 23f2b23..14d2d74 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -194,6 +194,7 @@ enum vkd3d_shader_opcode VKD3DSIH_DEFB, VKD3DSIH_DEFI, VKD3DSIH_DEQ, + VKD3DSIH_DGE, VKD3DSIH_DIV, VKD3DSIH_DMOV, VKD3DSIH_DP2, diff --git a/tests/d3d12.c b/tests/d3d12.c index 6b22580..c8dc460 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -9944,9 +9944,9 @@ static void test_shader_instructions(void) {&ps_deq, {.d = {{1.0, 0.0}}}, {{0x00000000}}, true}, {&ps_dne, {.d = {{0.0, 0.0}}}, {{0x00000000}}, true, true}, {&ps_dne, {.d = {{1.0, 0.0}}}, {{0xffffffff}}, true, true}, - {&ps_dge, {.d = {{0.0, 1.0}}}, {{0x00000000}}, true, true}, - {&ps_dge, {.d = {{1.0, 1.0}}}, {{0xffffffff}}, true, true}, - {&ps_dge, {.d = {{1.5, 1.0}}}, {{0xffffffff}}, true, true}, + {&ps_dge, {.d = {{0.0, 1.0}}}, {{0x00000000}}, true}, + {&ps_dge, {.d = {{1.0, 1.0}}}, {{0xffffffff}}, true}, + {&ps_dge, {.d = {{1.5, 1.0}}}, {{0xffffffff}}, true}, {&ps_dlt, {.d = {{0.0, 1.0}}}, {{0xffffffff}}, true, true}, {&ps_dlt, {.d = {{1.0, 1.0}}}, {{0x00000000}}, true, true}, {&ps_dtou, {.d = {{ -NAN}}}, {{ 0, 0 }}, true, true},

1 0

Conor McCarthy : vkd3d-shader: Implement DLT instruction.
by Alexandre Julliard 04 Aug '21

04 Aug '21

Module: vkd3d Branch: master Commit: 4ea3da306765713667f47b325bf4256a05d8e9f6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4ea3da306765713667f47b3… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Aug 4 12:56:09 2021 +1000 vkd3d-shader: Implement DLT instruction. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/dxbc.c | 2 ++ libs/vkd3d-shader/spirv.c | 2 ++ libs/vkd3d-shader/trace.c | 1 + libs/vkd3d-shader/vkd3d_shader_private.h | 1 + tests/d3d12.c | 4 ++-- 5 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index afeebb2..f557f83 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -313,6 +313,7 @@ enum vkd3d_sm4_opcode VKD3D_SM5_OP_DADD = 0xbf, VKD3D_SM5_OP_DEQ = 0xc3, VKD3D_SM5_OP_DGE = 0xc4, + VKD3D_SM5_OP_DLT = 0xc5, VKD3D_SM5_OP_DMOV = 0xc7, VKD3D_SM5_OP_EVAL_SAMPLE_INDEX = 0xcc, VKD3D_SM5_OP_EVAL_CENTROID = 0xcd, @@ -1256,6 +1257,7 @@ static const struct vkd3d_sm4_opcode_info opcode_table[] = {VKD3D_SM5_OP_DADD, VKD3DSIH_DADD, "d", "dd"}, {VKD3D_SM5_OP_DEQ, VKD3DSIH_DEQ, "u", "dd"}, {VKD3D_SM5_OP_DGE, VKD3DSIH_DGE, "u", "dd"}, + {VKD3D_SM5_OP_DLT, VKD3DSIH_DLT, "u", "dd"}, {VKD3D_SM5_OP_DMOV, VKD3DSIH_DMOV, "d", "d"}, {VKD3D_SM5_OP_EVAL_SAMPLE_INDEX, VKD3DSIH_EVAL_SAMPLE_INDEX, "f", "fi"}, {VKD3D_SM5_OP_EVAL_CENTROID, VKD3DSIH_EVAL_CENTROID, "f", "f"}, diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index eb63e82..bb9e2bf 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -7361,6 +7361,7 @@ static void vkd3d_dxbc_compiler_emit_comparison_instruction(struct vkd3d_dxbc_co case VKD3DSIH_IGE: op = SpvOpSGreaterThanEqual; break; case VKD3DSIH_ILT: op = SpvOpSLessThan; break; case VKD3DSIH_INE: op = SpvOpINotEqual; break; + case VKD3DSIH_DLT: case VKD3DSIH_LT: op = SpvOpFOrdLessThan; break; case VKD3DSIH_NE: op = SpvOpFUnordNotEqual; break; case VKD3DSIH_UGE: op = SpvOpUGreaterThanEqual; break; @@ -9573,6 +9574,7 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, break; case VKD3DSIH_DEQ: case VKD3DSIH_DGE: + case VKD3DSIH_DLT: case VKD3DSIH_EQ: case VKD3DSIH_GE: case VKD3DSIH_IEQ: diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index ee4ebb1..b35748b 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -107,6 +107,7 @@ static const char * const shader_opcode_names[] = /* VKD3DSIH_DEQ */ "deq", /* VKD3DSIH_DGE */ "dge", /* VKD3DSIH_DIV */ "div", + /* VKD3DSIH_DLT */ "dlt", /* VKD3DSIH_DMOV */ "dmov", /* VKD3DSIH_DP2 */ "dp2", /* VKD3DSIH_DP2ADD */ "dp2add", diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 14d2d74..2ce70db 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -196,6 +196,7 @@ enum vkd3d_shader_opcode VKD3DSIH_DEQ, VKD3DSIH_DGE, VKD3DSIH_DIV, + VKD3DSIH_DLT, VKD3DSIH_DMOV, VKD3DSIH_DP2, VKD3DSIH_DP2ADD, diff --git a/tests/d3d12.c b/tests/d3d12.c index c8dc460..1324fe1 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -9947,8 +9947,8 @@ static void test_shader_instructions(void) {&ps_dge, {.d = {{0.0, 1.0}}}, {{0x00000000}}, true}, {&ps_dge, {.d = {{1.0, 1.0}}}, {{0xffffffff}}, true}, {&ps_dge, {.d = {{1.5, 1.0}}}, {{0xffffffff}}, true}, - {&ps_dlt, {.d = {{0.0, 1.0}}}, {{0xffffffff}}, true, true}, - {&ps_dlt, {.d = {{1.0, 1.0}}}, {{0x00000000}}, true, true}, + {&ps_dlt, {.d = {{0.0, 1.0}}}, {{0xffffffff}}, true}, + {&ps_dlt, {.d = {{1.0, 1.0}}}, {{0x00000000}}, true}, {&ps_dtou, {.d = {{ -NAN}}}, {{ 0, 0 }}, true, true}, {&ps_dtou, {.d = {{ NAN}}}, {{ 0, 0 }}, true, true}, {&ps_dtou, {.d = {{-INFINITY}}}, {{ 0, ~0u}}, true, true},

1 0

Nikolay Sivov : d3d11/tests: Test 2D texture creation with mutually exclusive sharing modes.
by Alexandre Julliard 03 Aug '21

03 Aug '21

Module: wine Branch: master Commit: c83de7422dfd0f4279c8ca483981e14292555e44 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c83de7422dfd0f4279c8ca48… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jul 30 11:35:19 2021 +0300 d3d11/tests: Test 2D texture creation with mutually exclusive sharing modes. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 2213e48e57c..6073fae26d9 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -2736,6 +2736,8 @@ static void test_create_texture2d(void) {DXGI_FORMAT_R8G8B8A8_UINT, 1, D3D11_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R8G8B8A8_SNORM, 1, D3D11_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R8G8B8A8_SINT, 1, D3D11_BIND_RENDER_TARGET, 0, TRUE, FALSE}, + {DXGI_FORMAT_R8G8B8A8_UNORM, 1, D3D11_BIND_RENDER_TARGET, D3D11_RESOURCE_MISC_SHARED | D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX, + FALSE, TRUE}, {DXGI_FORMAT_D24_UNORM_S8_UINT, 1, D3D11_BIND_SHADER_RESOURCE, 0, FALSE, TRUE}, {DXGI_FORMAT_D24_UNORM_S8_UINT, 1, D3D11_BIND_RENDER_TARGET, 0, FALSE, FALSE}, {DXGI_FORMAT_D32_FLOAT, 1, D3D11_BIND_SHADER_RESOURCE, 0, FALSE, TRUE}, @@ -33447,7 +33449,7 @@ static void test_constant_buffer_offset(void) ID3D11Buffer *buffers[2], *ret_buffers[2]; D3D11_FEATURE_DATA_D3D11_OPTIONS options; struct d3d11_test_context test_context; - struct vec4 buffer_data[32] = {0}; + struct vec4 buffer_data[32] = {{0}}; ID3D11DeviceContext1 *context; UINT offsets[2], counts[2]; ID3D11PixelShader *ps;

1 0

Ziqing Hui : d2d1/tests: Add failure tests for ID2D1Effect_GetValue().
by Alexandre Julliard 03 Aug '21

03 Aug '21

Module: wine Branch: master Commit: d6f3e0ec6f8ec5477aa0684be0d77f60a5063c8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6f3e0ec6f8ec5477aa0684b… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Sat Jul 31 12:24:26 2021 +0800 d2d1/tests: Add failure tests for ID2D1Effect_GetValue(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 72487692abf..629bbd65523 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -9680,13 +9680,14 @@ static void test_mt_factory(BOOL d3d11) static void test_effect(BOOL d3d11) { - unsigned int i, min_inputs, max_inputs; + unsigned int i, min_inputs, max_inputs, str_size; D2D1_BUFFER_PRECISION precision; ID2D1Image *image_a, *image_b; struct d2d1_test_context ctx; ID2D1DeviceContext *context; ID2D1Factory1 *factory; ID2D1Effect *effect; + BYTE buffer[64]; BOOL cached; CLSID clsid; HRESULT hr; @@ -9735,6 +9736,33 @@ static void test_effect(BOOL d3d11) todo_wine { + hr = ID2D1Effect_GetValue(effect, 0xdeadbeef, D2D1_PROPERTY_TYPE_CLSID, (BYTE *)&clsid, sizeof(clsid)); + ok(hr == D2DERR_INVALID_PROPERTY, "Got unexpected hr %#x.\n", hr); + + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CLSID, D2D1_PROPERTY_TYPE_CLSID, buffer, sizeof(clsid) + 1); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CLSID, D2D1_PROPERTY_TYPE_CLSID, buffer, sizeof(clsid) - 1); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CLSID, D2D1_PROPERTY_TYPE_CLSID, buffer, sizeof(clsid)); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_DISPLAYNAME, D2D1_PROPERTY_TYPE_STRING, buffer, sizeof(buffer)); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + str_size = (wcslen((WCHAR *)buffer) + 1) * sizeof(WCHAR); + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_DISPLAYNAME, D2D1_PROPERTY_TYPE_STRING, buffer, str_size); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_DISPLAYNAME, D2D1_PROPERTY_TYPE_STRING, buffer, str_size - 1); + ok(hr == D2DERR_INSUFFICIENT_BUFFER, "Got unexpected hr %#x.\n", hr); + + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CLSID, 0xdeadbeef, (BYTE *)&clsid, sizeof(clsid)); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CLSID, D2D1_PROPERTY_TYPE_UNKNOWN, (BYTE *)&clsid, sizeof(clsid)); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CLSID, D2D1_PROPERTY_TYPE_VECTOR4, (BYTE *)&clsid, sizeof(clsid)); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CLSID, D2D1_PROPERTY_TYPE_VECTOR4, buffer, sizeof(buffer)); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID2D1Effect_GetValue(effect, D2D1_PROPERTY_CLSID, D2D1_PROPERTY_TYPE_CLSID, (BYTE *)&clsid, sizeof(clsid)); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr);

1 0

Andrew Eikum : dxgi/tests: Add tests to show frame latency object is a semaphore.
by Alexandre Julliard 03 Aug '21

03 Aug '21

Module: wine Branch: master Commit: 39f2398913d8de02261b42d540efc803694832eb URL: https://source.winehq.org/git/wine.git/?a=commit;h=39f2398913d8de02261b42d5… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Aug 2 12:37:04 2021 -0500 dxgi/tests: Add tests to show frame latency object is a semaphore. Shin Megami Tensei III Nocturne HD Remaster depends on the frame latency semaphore being released several times after it calls IDXGISwapChain2::SetMaximumFrameLatency(3). Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/tests/dxgi.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 7a4204c61b5..a83964d7523 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -6982,20 +6982,30 @@ static void test_frame_latency_event(IUnknown *device, BOOL is_d3d12) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); ok(frame_latency == 1, "Got unexpected frame latency %#x.\n", frame_latency); - hr = IDXGISwapChain2_SetMaximumFrameLatency(swapchain2, 2); + hr = IDXGISwapChain2_SetMaximumFrameLatency(swapchain2, 3); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); hr = IDXGISwapChain2_GetMaximumFrameLatency(swapchain2, &frame_latency); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - ok(frame_latency == 2, "Got unexpected frame latency %#x.\n", frame_latency); + ok(frame_latency == 3, "Got unexpected frame latency %#x.\n", frame_latency); + + wait_result = WaitForSingleObject(event, 0); + todo_wine ok(!wait_result, "Got unexpected wait result %#x.\n", wait_result); + wait_result = WaitForSingleObject(event, 0); + todo_wine ok(!wait_result, "Got unexpected wait result %#x.\n", wait_result); + wait_result = WaitForSingleObject(event, 100); + ok(wait_result == WAIT_TIMEOUT, "Got unexpected wait result %#x.\n", wait_result); for (i = 0; i < 5; i++) { hr = IDXGISwapChain2_Present(swapchain2, 0, 0); ok(hr == S_OK, "Present %u failed with hr %#x.\n", i, hr); + + wait_result = WaitForSingleObject(event, 100); + ok(!wait_result, "Got unexpected wait result %#x.\n", wait_result); } - wait_result = WaitForSingleObject(event, 1000); - ok(!wait_result, "Got unexpected wait result %#x.\n", wait_result); + wait_result = WaitForSingleObject(event, 100); + ok(wait_result == WAIT_TIMEOUT, "Got unexpected wait result %#x.\n", wait_result); ref_count = IDXGISwapChain2_Release(swapchain2); ok(!ref_count, "Swap chain has %u references left.\n", ref_count);

1 0

Martin Storsjö : msvcrt: Implement _statusfp for arm.
by Alexandre Julliard 03 Aug '21

03 Aug '21

Module: wine Branch: master Commit: 70400c93687438ecd705592a0439d19798c11935 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70400c93687438ecd705592a… Author: Martin Storsjö <martin(a)martin.st> Date: Tue Aug 3 15:56:10 2021 +0300 msvcrt: Implement _statusfp for arm. Signed-off-by: Martin Storsjö <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 05eacbb36fb..01b3e7002a6 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -5203,6 +5203,16 @@ unsigned int CDECL _statusfp(void) if (fpsr & 0x8) flags |= _SW_UNDERFLOW; if (fpsr & 0x10) flags |= _SW_INEXACT; if (fpsr & 0x80) flags |= _SW_DENORMAL; +#elif defined(__arm__) && !defined(__SOFTFP__) + DWORD fpscr; + + __asm__ __volatile__( "vmrs %0, fpscr" : "=r" (fpscr) ); + if (fpscr & 0x1) flags |= _SW_INVALID; + if (fpscr & 0x2) flags |= _SW_ZERODIVIDE; + if (fpscr & 0x4) flags |= _SW_OVERFLOW; + if (fpscr & 0x8) flags |= _SW_UNDERFLOW; + if (fpscr & 0x10) flags |= _SW_INEXACT; + if (fpscr & 0x80) flags |= _SW_DENORMAL; #else FIXME( "not implemented\n" ); #endif

1 0

Martin Storsjö : msvcrt: Implement _clearfp for arm.
by Alexandre Julliard 03 Aug '21

03 Aug '21

Module: wine Branch: master Commit: 1b6f59b5d0aa6d4da1483a129d6e53c89fe725a4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b6f59b5d0aa6d4da1483a12… Author: Martin Storsjö <martin(a)martin.st> Date: Tue Aug 3 15:56:11 2021 +0300 msvcrt: Implement _clearfp for arm. Signed-off-by: Martin Storsjö <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 01b3e7002a6..03394900e87 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -5260,6 +5260,18 @@ unsigned int CDECL _clearfp(void) if (fpsr & 0x80) flags |= _SW_DENORMAL; fpsr &= ~0x9f; __asm__ __volatile__( "msr fpsr, %0" :: "r" (fpsr) ); +#elif defined(__arm__) && !defined(__SOFTFP__) + DWORD fpscr; + + __asm__ __volatile__( "vmrs %0, fpscr" : "=r" (fpscr) ); + if (fpscr & 0x1) flags |= _SW_INVALID; + if (fpscr & 0x2) flags |= _SW_ZERODIVIDE; + if (fpscr & 0x4) flags |= _SW_OVERFLOW; + if (fpscr & 0x8) flags |= _SW_UNDERFLOW; + if (fpscr & 0x10) flags |= _SW_INEXACT; + if (fpscr & 0x80) flags |= _SW_DENORMAL; + fpscr &= ~0x9f; + __asm__ __volatile__( "vmsr fpscr, %0" :: "r" (fpscr) ); #else FIXME( "not implemented\n" ); #endif

1 0

Martin Storsjö : msvcrt: Implement _control87 for arm.
by Alexandre Julliard 03 Aug '21

03 Aug '21

Module: wine Branch: master Commit: 6521134705b36be3b15609726876df718b6e61bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=6521134705b36be3b1560972… Author: Martin Storsjö <martin(a)martin.st> Date: Tue Aug 3 15:56:12 2021 +0300 msvcrt: Implement _control87 for arm. Signed-off-by: Martin Storsjö <martin(a)martin.st> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 03394900e87..2ba810a9903 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -5554,6 +5554,37 @@ unsigned int CDECL _control87(unsigned int newval, unsigned int mask) case _RC_DOWN: fpcr |= 0x800000; break; } __asm__ __volatile__( "msr fpcr, %0" :: "r" (fpcr) ); +#elif defined(__arm__) && !defined(__SOFTFP__) + DWORD fpscr; + + __asm__ __volatile__( "vmrs %0, fpscr" : "=r" (fpscr) ); + if (!(fpscr & 0x100)) flags |= _EM_INVALID; + if (!(fpscr & 0x200)) flags |= _EM_ZERODIVIDE; + if (!(fpscr & 0x400)) flags |= _EM_OVERFLOW; + if (!(fpscr & 0x800)) flags |= _EM_UNDERFLOW; + if (!(fpscr & 0x1000)) flags |= _EM_INEXACT; + if (!(fpscr & 0x8000)) flags |= _EM_DENORMAL; + switch (fpscr & 0xc00000) + { + case 0x400000: flags |= _RC_UP; break; + case 0x800000: flags |= _RC_DOWN; break; + case 0xc00000: flags |= _RC_CHOP; break; + } + flags = (flags & ~mask) | (newval & mask); + fpscr &= ~0xc09f00ul; + if (!(flags & _EM_INVALID)) fpscr |= 0x100; + if (!(flags & _EM_ZERODIVIDE)) fpscr |= 0x200; + if (!(flags & _EM_OVERFLOW)) fpscr |= 0x400; + if (!(flags & _EM_UNDERFLOW)) fpscr |= 0x800; + if (!(flags & _EM_INEXACT)) fpscr |= 0x1000; + if (!(flags & _EM_DENORMAL)) fpscr |= 0x8000; + switch (flags & _MCW_RC) + { + case _RC_CHOP: fpscr |= 0xc00000; break; + case _RC_UP: fpscr |= 0x400000; break; + case _RC_DOWN: fpscr |= 0x800000; break; + } + __asm__ __volatile__( "vmsr fpscr, %0" :: "r" (fpscr) ); #else FIXME( "not implemented\n" ); #endif

1 0