wine-commits December 2016

wine-commits@winehq.org

2 participants
342 discussions

Nikolay Sivov : comctl32/tests: Trackbar test to show that thumb is updated on TBM_SETTICFREQ.
by Alexandre Julliard 13 Dec '16

13 Dec '16

Module: wine Branch: master Commit: 458ddd59b247a52fc4463a1a8b90d4744f154142 URL: http://source.winehq.org/git/wine.git/?a=commit;h=458ddd59b247a52fc4463a1a8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 12 22:03:20 2016 +0300 comctl32/tests: Trackbar test to show that thumb is updated on TBM_SETTICFREQ. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/trackbar.c | 47 +++++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index 28af8c5..a6f1462 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -890,7 +890,7 @@ static void test_thumb_length(void) static void test_tic_settings(void) { HWND hWndTrackbar; - int r; + int r, i; hWndTrackbar = create_trackbar(defaultstyle, hWndParent); ok(hWndTrackbar != NULL, "Expected non NULL value\n"); @@ -955,6 +955,51 @@ static void test_tic_settings(void) SendMessageA(hWndTrackbar, TBM_SETTICFREQ, 1, 0); r = SendMessageA(hWndTrackbar, TBM_GETNUMTICS, 0, 0); expect(3, r); + + DestroyWindow(hWndTrackbar); + + /* Test to show that TBM_SETTICFREQ updates thumb */ + for (i = 0; i < 2; i++) + { + DWORD style = i ? defaultstyle : defaultstyle & ~TBS_AUTOTICKS; + RECT rect, rect1; + WNDPROC oldproc; + + hWndTrackbar = create_trackbar2(style, hWndParent); + ok(hWndTrackbar != NULL, "Expected non NULL value\n"); + + oldproc = (WNDPROC)SetWindowLongPtrA(hWndTrackbar, GWLP_WNDPROC, (LONG_PTR)trackbar_no_wmpaint_proc); + SetWindowLongPtrA(hWndTrackbar, GWLP_USERDATA, (LONG_PTR)oldproc); + + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect); + SendMessageA(hWndTrackbar, TBM_SETPOS, FALSE, 0); + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect1); + ok(EqualRect(&rect, &rect1), "Unexpected thumb rectangle %s, previous %s\n", + wine_dbgstr_rect(&rect1), wine_dbgstr_rect(&rect)); + + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect); + SendMessageA(hWndTrackbar, TBM_SETRANGE, FALSE, MAKELONG(-100, 100)); + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect1); + ok(EqualRect(&rect, &rect1), "Unexpected thumb rectangle %s, previous %s\n", + wine_dbgstr_rect(&rect1), wine_dbgstr_rect(&rect)); + /* Old position is also 0, but thumb position will be different after range change */ + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect); + SendMessageA(hWndTrackbar, TBM_SETPOS, TRUE, 0); + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect1); + ok(EqualRect(&rect, &rect1), "Unexpected thumb rectangle %s, previous %s\n", + wine_dbgstr_rect(&rect1), wine_dbgstr_rect(&rect)); + /* Previous frequency is also 1, yet thumb is updated */ + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect); + SendMessageA(hWndTrackbar, TBM_SETTICFREQ, 1, 0); + SendMessageA(hWndTrackbar, TBM_GETTHUMBRECT, 0, (LPARAM)&rect1); + todo_wine + ok(!EqualRect(&rect, &rect1), "Unexpected thumb rectangle %s, previous %s\n", + wine_dbgstr_rect(&rect1), wine_dbgstr_rect(&rect)); + + SetWindowLongPtrA(hWndTrackbar, GWLP_WNDPROC, (LONG_PTR)oldproc); + + DestroyWindow(hWndTrackbar); + } } static void test_tic_placement(void)

1 0

Lauri Kenttä : kernel32/tests: Show flags as text in test results.
by Alexandre Julliard 12 Dec '16

12 Dec '16

Module: wine Branch: master Commit: 44c1f0cd962206f96ccb731aad206adf3a2c3f1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=44c1f0cd962206f96ccb731aa… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Fri Dec 9 22:04:18 2016 +0200 kernel32/tests: Show flags as text in test results. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 89 ++++++++++++++++++++++++---------------------- 1 file changed, 46 insertions(+), 43 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=44c1f0cd962206f96ccb7…

1 0

Lauri Kenttä : kernel32/tests: Test FindFirstFile with wildcards.
by Alexandre Julliard 12 Dec '16

12 Dec '16

Module: wine Branch: master Commit: f7b625754e8a6bf1be47b3fbca84e0bbe7060138 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7b625754e8a6bf1be47b3fbc… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Fri Dec 9 16:09:28 2016 +0200 kernel32/tests: Test FindFirstFile with wildcards. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 92 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 70424db..9f4dd2d 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -2813,6 +2813,97 @@ cleanup: RemoveDirectoryA("test-dir"); } +static void test_FindFirstFile_wildcards(void) +{ + WIN32_FIND_DATAA find_data; + HANDLE handle; + int i; + static const char* files[] = { + "..a", "..a.a", ".a", ".a..a", ".a.a", ".aaa", + "a", "a..a", "a.a", "a.a.a", "aa", "aaa", "aaaa" + }; + static const struct { + int todo; + const char *pattern, *result; + } tests[] = { + {0, "*.*.*", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a', 'a..a', 'a.a', 'a.a.a', 'aa', 'aaa', 'aaaa'"}, + {0, "*.*.", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a', 'a..a', 'a.a', 'a.a.a', 'aa', 'aaa', 'aaaa'"}, + {0, ".*.*", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa'"}, + {0, "*.*", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a', 'a..a', 'a.a', 'a.a.a', 'aa', 'aaa', 'aaaa'"}, + {0, ".*", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa'"}, + {1, "*.", ", '.', '..', 'a', '.a', '..a', 'aa', 'aaa', 'aaaa', '.aaa'"}, + {0, "*", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a', 'a..a', 'a.a', 'a.a.a', 'aa', 'aaa', 'aaaa'"}, + {1, "*..*", ", '.', '..', '..a', '..a.a', '.a..a', 'a..a'"}, + {1, "*..", ", '.', '..', 'a', '.a', '..a', 'aa', 'aaa', 'aaaa', '.aaa'"}, + {1, ".*.", ", '.', '..', '.a', '.aaa'"}, + {0, "..*", ", '.', '..', '..a', '..a.a'"}, + {0, "**", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a', 'a..a', 'a.a', 'a.a.a', 'aa', 'aaa', 'aaaa'"}, + {0, "**.", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a', 'a..a', 'a.a', 'a.a.a', 'aa', 'aaa', 'aaaa'"}, + {0, "*. ", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a', 'a..a', 'a.a', 'a.a.a', 'aa', 'aaa', 'aaaa'"}, + {1, "* .", ", '.', '..', 'a', '.a', '..a', 'aa', 'aaa', 'aaaa', '.aaa'"}, + {0, "* . ", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a', 'a..a', 'a.a', 'a.a.a', 'aa', 'aaa', 'aaaa'"}, + {0, "*.. ", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a', 'a..a', 'a.a', 'a.a.a', 'aa', 'aaa', 'aaaa'"}, + {1, "*. .", ", '.', '..', 'a', '.a', '..a', 'aa', 'aaa', 'aaaa', '.aaa'"}, + {1, "* ..", ", '.', '..', 'a', '.a', '..a', 'aa', 'aaa', 'aaaa', '.aaa'"}, + {1, " *..", ", '.aaa'"}, + {0, "..* ", ", '.', '..', '..a', '..a.a'"}, + {1, "?", ", '.', '..', 'a'"}, + {1, "?.", ", '.', '..', 'a'"}, + {1, "?. ", ", '.', '..', 'a'"}, + {1, "??.", ", '.', '..', 'a', 'aa'"}, + {1, "??. ", ", '.', '..', 'a', 'aa'"}, + {1, "???.", ", '.', '..', 'a', 'aa', 'aaa'"}, + {1, "?.??.", ", '.', '..', '.a', 'a', 'a.a'"} + }; + + CreateDirectoryA("test-dir", NULL); + SetCurrentDirectoryA("test-dir"); + for (i = 0; i < sizeof(files) / sizeof(files[0]); ++i) + _lclose(_lcreat(files[i], 0)); + + for (i = 0; i < sizeof(tests) / sizeof(tests[0]); ++i) + { + char correct[512]; + char incorrect[512]; + char missing[512]; + + strcpy(missing, tests[i].result); + correct[0] = incorrect[0] = 0; + + handle = FindFirstFileA(tests[i].pattern, &find_data); + if (handle) do { + char* ptr; + char quoted[16]; + + sprintf( quoted, ", '%.10s'", find_data.cFileName ); + + if ((ptr = strstr(missing, quoted))) + { + int len = strlen(quoted); + while ((ptr[0] = ptr[len]) != 0) + ++ptr; + strcat(correct, quoted); + } + else + strcat(incorrect, quoted); + } while (FindNextFileA(handle, &find_data)); + FindClose(handle); + + todo_wine_if (tests[i].todo) + ok(missing[0] == 0 && incorrect[0] == 0, + "FindFirstFile with '%s' found correctly %s, found incorrectly %s, and missed %s\n", + tests[i].pattern, + correct[0] ? correct+2 : "none", + incorrect[0] ? incorrect+2 : "none", + missing[0] ? missing+2 : "none"); + } + + for (i = 0; i < sizeof(files) / sizeof(files[0]); ++i) + DeleteFileA(files[i]); + SetCurrentDirectoryA(".."); + RemoveDirectoryA("test-dir"); +} + static int test_Mapfile_createtemp(HANDLE *handle) { SetFileAttributesA(filename,FILE_ATTRIBUTE_NORMAL); @@ -4741,6 +4832,7 @@ START_TEST(file) test_MoveFileW(); test_FindFirstFileA(); test_FindNextFileA(); + test_FindFirstFile_wildcards(); test_FindFirstFileExA(FindExInfoStandard, 0, 0); test_FindFirstFileExA(FindExInfoStandard, 0, FIND_FIRST_EX_CASE_SENSITIVE); test_FindFirstFileExA(FindExInfoStandard, 0, FIND_FIRST_EX_LARGE_FETCH);

1 0

Józef Kucia : wined3d: Recognize SM5 atomic_imin opcode.
by Alexandre Julliard 12 Dec '16

12 Dec '16

Module: wine Branch: master Commit: 5e4e2a1535885c447d081d81ceb4b620e73ecb00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e4e2a1535885c447d081d81c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Dec 9 11:30:53 2016 +0100 wined3d: Recognize SM5 atomic_imin opcode. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index cab03b9..210b2f9 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5206,6 +5206,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_ATOMIC_CMP_STORE */ NULL, /* WINED3DSIH_ATOMIC_IADD */ NULL, /* WINED3DSIH_ATOMIC_IMAX */ NULL, + /* WINED3DSIH_ATOMIC_IMIN */ NULL, /* WINED3DSIH_ATOMIC_OR */ NULL, /* WINED3DSIH_ATOMIC_UMAX */ NULL, /* WINED3DSIH_ATOMIC_UMIN */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1f9f5dd..a8d208e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8930,6 +8930,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_ATOMIC_CMP_STORE */ NULL, /* WINED3DSIH_ATOMIC_IADD */ shader_glsl_atomic, /* WINED3DSIH_ATOMIC_IMAX */ NULL, + /* WINED3DSIH_ATOMIC_IMIN */ NULL, /* WINED3DSIH_ATOMIC_OR */ NULL, /* WINED3DSIH_ATOMIC_UMAX */ NULL, /* WINED3DSIH_ATOMIC_UMIN */ NULL, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 3c11fea..5e9b0de 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -47,6 +47,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_ATOMIC_CMP_STORE */ "atomic_cmp_store", /* WINED3DSIH_ATOMIC_IADD */ "atomic_iadd", /* WINED3DSIH_ATOMIC_IMAX */ "atomic_imax", + /* WINED3DSIH_ATOMIC_IMIN */ "atomic_imin", /* WINED3DSIH_ATOMIC_OR */ "atomic_or", /* WINED3DSIH_ATOMIC_UMAX */ "atomic_umax", /* WINED3DSIH_ATOMIC_UMIN */ "atomic_umin", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 1fffbc7..66c33b3 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -265,6 +265,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_ATOMIC_CMP_STORE = 0xac, WINED3D_SM5_OP_ATOMIC_IADD = 0xad, WINED3D_SM5_OP_ATOMIC_IMAX = 0xae, + WINED3D_SM5_OP_ATOMIC_IMIN = 0xaf, WINED3D_SM5_OP_ATOMIC_UMAX = 0xb0, WINED3D_SM5_OP_ATOMIC_UMIN = 0xb1, WINED3D_SM5_OP_IMM_ATOMIC_ALLOC = 0xb2, @@ -972,6 +973,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_ATOMIC_CMP_STORE, WINED3DSIH_ATOMIC_CMP_STORE, "U", "iuu"}, {WINED3D_SM5_OP_ATOMIC_IADD, WINED3DSIH_ATOMIC_IADD, "U", "ii"}, {WINED3D_SM5_OP_ATOMIC_IMAX, WINED3DSIH_ATOMIC_IMAX, "U", "ii"}, + {WINED3D_SM5_OP_ATOMIC_IMIN, WINED3DSIH_ATOMIC_IMIN, "U", "ii"}, {WINED3D_SM5_OP_ATOMIC_UMAX, WINED3DSIH_ATOMIC_UMAX, "U", "iu"}, {WINED3D_SM5_OP_ATOMIC_UMIN, WINED3DSIH_ATOMIC_UMIN, "U", "iu"}, {WINED3D_SM5_OP_IMM_ATOMIC_ALLOC, WINED3DSIH_IMM_ATOMIC_ALLOC, "u", "U"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6597300..35e60c6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -578,6 +578,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_ATOMIC_CMP_STORE, WINED3DSIH_ATOMIC_IADD, WINED3DSIH_ATOMIC_IMAX, + WINED3DSIH_ATOMIC_IMIN, WINED3DSIH_ATOMIC_OR, WINED3DSIH_ATOMIC_UMAX, WINED3DSIH_ATOMIC_UMIN,

1 0

Józef Kucia : wined3d: Recognize SM5 atomic_imax opcode.
by Alexandre Julliard 12 Dec '16

12 Dec '16

Module: wine Branch: master Commit: 5763e7f98c8ab606b4e66e15348842c8fe2bbc58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5763e7f98c8ab606b4e66e153… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Dec 9 11:30:52 2016 +0100 wined3d: Recognize SM5 atomic_imax opcode. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 54abcb8..cab03b9 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5205,6 +5205,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_ATOMIC_AND */ NULL, /* WINED3DSIH_ATOMIC_CMP_STORE */ NULL, /* WINED3DSIH_ATOMIC_IADD */ NULL, + /* WINED3DSIH_ATOMIC_IMAX */ NULL, /* WINED3DSIH_ATOMIC_OR */ NULL, /* WINED3DSIH_ATOMIC_UMAX */ NULL, /* WINED3DSIH_ATOMIC_UMIN */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index d1c0a95..1f9f5dd 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8929,6 +8929,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_ATOMIC_AND */ NULL, /* WINED3DSIH_ATOMIC_CMP_STORE */ NULL, /* WINED3DSIH_ATOMIC_IADD */ shader_glsl_atomic, + /* WINED3DSIH_ATOMIC_IMAX */ NULL, /* WINED3DSIH_ATOMIC_OR */ NULL, /* WINED3DSIH_ATOMIC_UMAX */ NULL, /* WINED3DSIH_ATOMIC_UMIN */ NULL, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index feaa6b9..3c11fea 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -46,6 +46,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_ATOMIC_AND */ "atomic_and", /* WINED3DSIH_ATOMIC_CMP_STORE */ "atomic_cmp_store", /* WINED3DSIH_ATOMIC_IADD */ "atomic_iadd", + /* WINED3DSIH_ATOMIC_IMAX */ "atomic_imax", /* WINED3DSIH_ATOMIC_OR */ "atomic_or", /* WINED3DSIH_ATOMIC_UMAX */ "atomic_umax", /* WINED3DSIH_ATOMIC_UMIN */ "atomic_umin", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index aa6aead..1fffbc7 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -264,6 +264,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_ATOMIC_XOR = 0xab, WINED3D_SM5_OP_ATOMIC_CMP_STORE = 0xac, WINED3D_SM5_OP_ATOMIC_IADD = 0xad, + WINED3D_SM5_OP_ATOMIC_IMAX = 0xae, WINED3D_SM5_OP_ATOMIC_UMAX = 0xb0, WINED3D_SM5_OP_ATOMIC_UMIN = 0xb1, WINED3D_SM5_OP_IMM_ATOMIC_ALLOC = 0xb2, @@ -970,6 +971,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_ATOMIC_XOR, WINED3DSIH_ATOMIC_XOR, "U", "iu"}, {WINED3D_SM5_OP_ATOMIC_CMP_STORE, WINED3DSIH_ATOMIC_CMP_STORE, "U", "iuu"}, {WINED3D_SM5_OP_ATOMIC_IADD, WINED3DSIH_ATOMIC_IADD, "U", "ii"}, + {WINED3D_SM5_OP_ATOMIC_IMAX, WINED3DSIH_ATOMIC_IMAX, "U", "ii"}, {WINED3D_SM5_OP_ATOMIC_UMAX, WINED3DSIH_ATOMIC_UMAX, "U", "iu"}, {WINED3D_SM5_OP_ATOMIC_UMIN, WINED3DSIH_ATOMIC_UMIN, "U", "iu"}, {WINED3D_SM5_OP_IMM_ATOMIC_ALLOC, WINED3DSIH_IMM_ATOMIC_ALLOC, "u", "U"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d632d42..6597300 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -577,6 +577,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_ATOMIC_AND, WINED3DSIH_ATOMIC_CMP_STORE, WINED3DSIH_ATOMIC_IADD, + WINED3DSIH_ATOMIC_IMAX, WINED3DSIH_ATOMIC_OR, WINED3DSIH_ATOMIC_UMAX, WINED3DSIH_ATOMIC_UMIN,

1 0

Józef Kucia : wined3d: Recognize SM4.1 oMask output register.
by Alexandre Julliard 12 Dec '16

12 Dec '16

Module: wine Branch: master Commit: 0700c9e599fdfe3355f151484c4657bbb685988e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0700c9e599fdfe3355f151484… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Dec 9 11:30:51 2016 +0100 wined3d: Recognize SM4.1 oMask output register. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 4 ++++ dlls/wined3d/shader_sm4.c | 3 ++- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index e5b969c..feaa6b9 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1935,6 +1935,10 @@ static void shader_dump_register(struct wined3d_string_buffer *buffer, shader_addline(buffer, "vCoverage"); break; + case WINED3DSPR_SAMPLEMASK: + shader_addline(buffer, "oMask"); + break; + default: shader_addline(buffer, "<unhandled_rtype(%#x)>", reg->type); break; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 4ed2391..aa6aead 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -292,6 +292,7 @@ enum wined3d_sm4_register_type WINED3D_SM4_RT_PRIMID = 0x0b, WINED3D_SM4_RT_DEPTHOUT = 0x0c, WINED3D_SM4_RT_NULL = 0x0d, + WINED3D_SM4_RT_OMASK = 0x0f, WINED3D_SM5_RT_STREAM = 0x10, WINED3D_SM5_RT_FUNCTION_BODY = 0x11, WINED3D_SM5_RT_FUNCTION_POINTER = 0x13, @@ -1001,7 +1002,7 @@ static const enum wined3d_shader_register_type register_type_table[] = /* WINED3D_SM4_RT_DEPTHOUT */ WINED3DSPR_DEPTHOUT, /* WINED3D_SM4_RT_NULL */ WINED3DSPR_NULL, /* UNKNOWN */ ~0u, - /* UNKNOWN */ ~0u, + /* WINED3D_SM4_RT_OMASK */ WINED3DSPR_SAMPLEMASK, /* WINED3D_SM5_RT_STREAM */ WINED3DSPR_STREAM, /* WINED3D_SM5_RT_FUNCTION_BODY */ WINED3DSPR_FUNCTIONBODY, /* UNKNOWN */ ~0u, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0be5856..d632d42 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -395,6 +395,7 @@ enum wined3d_shader_register_type WINED3DSPR_FUNCTIONBODY, WINED3DSPR_FUNCTIONPOINTER, WINED3DSPR_COVERAGE, + WINED3DSPR_SAMPLEMASK, }; enum wined3d_data_type

1 0

Józef Kucia : wined3d: Recognize SM5 vCoverage input registers.
by Alexandre Julliard 12 Dec '16

12 Dec '16

Module: wine Branch: master Commit: c6b2977e69e591df249cc7c211e4422b912c1953 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6b2977e69e591df249cc7c21… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Dec 9 11:30:50 2016 +0100 wined3d: Recognize SM5 vCoverage input registers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 4 ++++ dlls/wined3d/shader_sm4.c | 3 ++- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 24051cc..e5b969c 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1931,6 +1931,10 @@ static void shader_dump_register(struct wined3d_string_buffer *buffer, shader_addline(buffer, "fp"); break; + case WINED3DSPR_COVERAGE: + shader_addline(buffer, "vCoverage"); + break; + default: shader_addline(buffer, "<unhandled_rtype(%#x)>", reg->type); break; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 4a4926b..4ed2391 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -306,6 +306,7 @@ enum wined3d_sm4_register_type WINED3D_SM5_RT_THREAD_ID = 0x20, WINED3D_SM5_RT_THREAD_GROUP_ID = 0x21, WINED3D_SM5_RT_LOCAL_THREAD_ID = 0x22, + WINED3D_SM5_RT_COVERAGE = 0x23, WINED3D_SM5_RT_LOCAL_THREAD_INDEX = 0x24, }; @@ -1020,7 +1021,7 @@ static const enum wined3d_shader_register_type register_type_table[] = /* WINED3D_SM5_RT_THREAD_ID */ WINED3DSPR_THREADID, /* WINED3D_SM5_RT_THREAD_GROUP_ID */ WINED3DSPR_THREADGROUPID, /* WINED3D_SM5_RT_LOCAL_THREAD_ID */ WINED3DSPR_LOCALTHREADID, - /* UNKNOWN */ ~0u, + /* WINED3D_SM5_RT_COVERAGE */ WINED3DSPR_COVERAGE, /* WINED3D_SM5_RT_LOCAL_THREAD_INDEX */ WINED3DSPR_LOCALTHREADINDEX, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e788f59..0be5856 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -394,6 +394,7 @@ enum wined3d_shader_register_type WINED3DSPR_STREAM, WINED3DSPR_FUNCTIONBODY, WINED3DSPR_FUNCTIONPOINTER, + WINED3DSPR_COVERAGE, }; enum wined3d_data_type

1 0

Józef Kucia : d3d11/tests: Add test for depth/ stencil shader resource views.
by Alexandre Julliard 12 Dec '16

12 Dec '16

Module: wine Branch: master Commit: 7ed0e333881d7ffa974030ba5490c9faaba317e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ed0e333881d7ffa974030ba5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Dec 9 11:30:49 2016 +0100 d3d11/tests: Add test for depth/stencil shader resource views. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 349 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 349 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7ed0e333881d7ffa97403…

1 0

Józef Kucia : wined3d: Use depth/ stencil formats for typeless resources only when WINED3DUSAGE_DEPTHSTENCIL is set.
by Alexandre Julliard 12 Dec '16

12 Dec '16

Module: wine Branch: master Commit: a02fd72965602eb93fa1fc14a8fc8e022a0dbce6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a02fd72965602eb93fa1fc14a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Dec 9 11:30:48 2016 +0100 wined3d: Use depth/stencil formats for typeless resources only when WINED3DUSAGE_DEPTHSTENCIL is set. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/context.c | 12 ++++--- dlls/wined3d/directx.c | 19 +++++----- dlls/wined3d/surface.c | 2 +- dlls/wined3d/swapchain.c | 4 +-- dlls/wined3d/texture.c | 13 ++++--- dlls/wined3d/utils.c | 76 ++++++++++++++++++++++++++++++---------- dlls/wined3d/vertexdeclaration.c | 4 +-- dlls/wined3d/view.c | 6 ++-- dlls/wined3d/wined3d_private.h | 2 +- 10 files changed, 92 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a02fd72965602eb93fa1f…

1 0

Józef Kucia : d3d11/tests: Add test for 2D array texture UAVs.
by Alexandre Julliard 12 Dec '16

12 Dec '16

Module: wine Branch: master Commit: 0f08eddb15aa0981e2a0045acfb65999cda4aefd URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f08eddb15aa0981e2a0045ac… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Dec 9 11:30:47 2016 +0100 d3d11/tests: Add test for 2D array texture UAVs. Signed-off-by: Józef Kucia <jkucia(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 | 82 +++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 74 insertions(+), 8 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 6f413c5..be34166 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -11403,7 +11403,7 @@ static void test_uav_load(void) UINT miplevel_count; UINT array_size; DXGI_FORMAT format; - D3D11_SUBRESOURCE_DATA data[1]; + D3D11_SUBRESOURCE_DATA data[3]; }; /* FIXME: Use a single R32_TYPELESS RT with multiple RTVs. */ @@ -11421,6 +11421,7 @@ static void test_uav_load(void) ID3D11PixelShader *ps; ID3D11Device *device; unsigned int i, x, y; + ID3D11Buffer *cb; HRESULT hr; static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; @@ -11506,6 +11507,37 @@ static void test_uav_load(void) 0x00102012, 0x00000000, 0x0010000a, 0x00000000, 0x0100003e, }; static const struct shader ps_ld_2d_int = {ps_ld_2d_int_code, sizeof(ps_ld_2d_int_code)}; + static const DWORD ps_ld_2d_uint_arr_code[] = + { +#if 0 + RWTexture2DArray<uint> u; + + uint layer; + + uint main(float4 position : SV_Position) : SV_Target + { + float3 s; + u.GetDimensions(s.x, s.y, s.z); + s.z = layer; + return u[s * float3(position.x / 640.0f, position.y / 480.0f, 1.0f)]; + } +#endif + 0x43425844, 0xa7630358, 0xd7e7228f, 0xa9f1be03, 0x838554f1, 0x00000001, 0x000001bc, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x7469736f, 0x006e6f69, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, + 0x00000000, 0x00000e01, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000120, 0x00000050, + 0x00000048, 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x0400409c, 0x0011e000, + 0x00000001, 0x00004444, 0x04002064, 0x00101032, 0x00000000, 0x00000001, 0x03000065, 0x00102012, + 0x00000000, 0x02000068, 0x00000001, 0x8900003d, 0x80000202, 0x00111103, 0x00100032, 0x00000000, + 0x00004001, 0x00000000, 0x0011ee46, 0x00000001, 0x07000038, 0x00100032, 0x00000000, 0x00100046, + 0x00000000, 0x00101046, 0x00000000, 0x06000056, 0x001000c2, 0x00000000, 0x00208006, 0x00000000, + 0x00000000, 0x0a000038, 0x001000f2, 0x00000000, 0x00100e46, 0x00000000, 0x00004002, 0x3acccccd, + 0x3b088889, 0x3f800000, 0x3f800000, 0x0500001c, 0x001000f2, 0x00000000, 0x00100e46, 0x00000000, + 0x890000a3, 0x80000202, 0x00111103, 0x00100012, 0x00000000, 0x00100e46, 0x00000000, 0x0011ee46, + 0x00000001, 0x05000036, 0x00102012, 0x00000000, 0x0010000a, 0x00000000, 0x0100003e, + }; + static const struct shader ps_ld_2d_uint_arr = {ps_ld_2d_uint_arr_code, sizeof(ps_ld_2d_uint_arr_code)}; static const float float_data[] = { 0.50f, 0.25f, 1.00f, 0.00f, @@ -11520,6 +11552,20 @@ static void test_uav_load(void) 0x80, 0x90, 0xa0, 0xb0, 0xc0, 0xd0, 0xe0, 0xf0, }; + static const unsigned int uint_data2[] = + { + 0xffff, 0xffff, 0xffff, 0xffff, + 0xffff, 0xc000, 0xc000, 0xffff, + 0xffff, 0xc000, 0xc000, 0xffff, + 0xffff, 0xffff, 0xffff, 0xffff, + }; + static const unsigned int uint_data3[] = + { + 0xaa, 0xaa, 0xcc, 0xcc, + 0xaa, 0xaa, 0xdd, 0xdd, + 0xbb, 0xbb, 0xee, 0xee, + 0xbb, 0xbb, 0xff, 0xff, + }; static const int int_data[] = { -1, 0x10, 0x20, 0x30, @@ -11531,6 +11577,10 @@ static void test_uav_load(void) {{float_data, 4 * sizeof(*float_data), 0}}}; static const struct texture uint_2d = {4, 4, 1, 1, DXGI_FORMAT_R32_UINT, {{uint_data, 4 * sizeof(*uint_data), 0}}}; + static const struct texture uint2d_arr = {4, 4, 1, 3, DXGI_FORMAT_R32_UINT, + {{uint_data, 4 * sizeof(*uint_data), 0}, + {uint_data2, 4 * sizeof(*uint_data2), 0}, + {uint_data3, 4 * sizeof(*uint_data3), 0}}}; static const struct texture int_2d = {4, 4, 1, 1, DXGI_FORMAT_R32_SINT, {{int_data, 4 * sizeof(*int_data), 0}}}; @@ -11539,18 +11589,27 @@ static void test_uav_load(void) const struct shader *ps; const struct texture *texture; struct uav_desc uav_desc; + struct uvec4 constant; const DWORD *expected_colors; } tests[] = { -#define TEX_2D D3D11_UAV_DIMENSION_TEXTURE2D -#define R32_FLOAT DXGI_FORMAT_R32_FLOAT -#define R32_UINT DXGI_FORMAT_R32_UINT -#define R32_SINT DXGI_FORMAT_R32_SINT - {&ps_ld_2d_float, &float_2d, {R32_FLOAT, TEX_2D, 0}, (const DWORD *)float_data}, - {&ps_ld_2d_uint, &uint_2d, {R32_UINT, TEX_2D, 0}, (const DWORD *)uint_data}, - {&ps_ld_2d_int, &int_2d, {R32_SINT, TEX_2D, 0}, (const DWORD *)int_data}, +#define TEX_2D D3D11_UAV_DIMENSION_TEXTURE2D +#define TEX_2D_ARRAY D3D11_UAV_DIMENSION_TEXTURE2DARRAY +#define R32_FLOAT DXGI_FORMAT_R32_FLOAT +#define R32_UINT DXGI_FORMAT_R32_UINT +#define R32_SINT DXGI_FORMAT_R32_SINT + {&ps_ld_2d_float, &float_2d, {R32_FLOAT, TEX_2D, 0}, {}, (const DWORD *)float_data}, + {&ps_ld_2d_uint, &uint_2d, {R32_UINT, TEX_2D, 0}, {}, (const DWORD *)uint_data}, + {&ps_ld_2d_int, &int_2d, {R32_SINT, TEX_2D, 0}, {}, (const DWORD *)int_data}, + {&ps_ld_2d_uint_arr, &uint2d_arr, {R32_UINT, TEX_2D_ARRAY, 0, 0, ~0u}, {0}, (const DWORD *)uint_data}, + {&ps_ld_2d_uint_arr, &uint2d_arr, {R32_UINT, TEX_2D_ARRAY, 0, 0, ~0u}, {1}, (const DWORD *)uint_data2}, + {&ps_ld_2d_uint_arr, &uint2d_arr, {R32_UINT, TEX_2D_ARRAY, 0, 0, ~0u}, {2}, (const DWORD *)uint_data3}, + {&ps_ld_2d_uint_arr, &uint2d_arr, {R32_UINT, TEX_2D_ARRAY, 0, 1, ~0u}, {0}, (const DWORD *)uint_data2}, + {&ps_ld_2d_uint_arr, &uint2d_arr, {R32_UINT, TEX_2D_ARRAY, 0, 1, ~0u}, {1}, (const DWORD *)uint_data3}, + {&ps_ld_2d_uint_arr, &uint2d_arr, {R32_UINT, TEX_2D_ARRAY, 0, 2, ~0u}, {0}, (const DWORD *)uint_data3}, #undef TEX_2D +#undef TEX_2D_ARRAY #undef R32_FLOAT #undef R32_UINT #undef R32_SINT @@ -11593,6 +11652,9 @@ static void test_uav_load(void) texture_desc.BindFlags = D3D11_BIND_UNORDERED_ACCESS; + cb = create_buffer(device, D3D11_BIND_CONSTANT_BUFFER, sizeof(struct uvec4), NULL); + ID3D11DeviceContext_PSSetConstantBuffers(context, 0, 1, &cb); + ps = NULL; uav = NULL; texture = NULL; @@ -11604,6 +11666,9 @@ static void test_uav_load(void) ID3D11RenderTargetView *current_rtv; ID3D11Texture2D *current_rt; + ID3D11DeviceContext_UpdateSubresource(context, (ID3D11Resource *)cb, 0, + NULL, &test->constant, 0, 0); + if (current_ps != test->ps) { if (ps) @@ -11687,6 +11752,7 @@ static void test_uav_load(void) ID3D11Texture2D_Release(texture); ID3D11UnorderedAccessView_Release(uav); + ID3D11Buffer_Release(cb); ID3D11RenderTargetView_Release(rtv_float); ID3D11RenderTargetView_Release(rtv_sint); ID3D11RenderTargetView_Release(rtv_uint);

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
35
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2016