wine-commits January 2022

wine-commits@winehq.org

2 participants
726 discussions

Alexandre Julliard : Release 7.1.
by Alexandre Julliard 28 Jan '22

28 Jan '22

Module: wine Branch: master Commit: 594e431e36d65e470bcbe930eb3d0f2bbca17736 URL: https://source.winehq.org/git/wine.git/?a=commit;h=594e431e36d65e470bcbe930… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 28 21:27:46 2022 +0100 Release 7.1. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 963 +++++++++++++++++++++++++++++++++++--------------------------- AUTHORS | 3 + VERSION | 2 +- configure | 18 +- 4 files changed, 559 insertions(+), 427 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=594e431e36d65e470bcb…

1 0

Daniel Lehman : msvcp140_atomic_wait: Implement __std_bulk_submit_threadpool_work.
by Alexandre Julliard 28 Jan '22

28 Jan '22

Module: wine Branch: master Commit: a7f71dbb7b6146a95b5fe551a9e27ba3347a529c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7f71dbb7b6146a95b5fe551… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Jan 28 16:19:20 2022 +0100 msvcp140_atomic_wait: Implement __std_bulk_submit_threadpool_work. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140_atomic_wait/main.c | 7 +++++++ dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec | 2 +- .../tests/msvcp140_atomic_wait.c | 20 ++++++++++++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/dlls/msvcp140_atomic_wait/main.c b/dlls/msvcp140_atomic_wait/main.c index c00ed08bffe..f489a7d8e05 100644 --- a/dlls/msvcp140_atomic_wait/main.c +++ b/dlls/msvcp140_atomic_wait/main.c @@ -31,6 +31,13 @@ unsigned int __stdcall __std_parallel_algorithms_hw_threads(void) return _Thrd_hardware_concurrency(); } +void __stdcall __std_bulk_submit_threadpool_work(PTP_WORK work, size_t count) +{ + TRACE("(%p %Iu)\n", work, count); + while (count--) + SubmitThreadpoolWork(work); +} + void __stdcall __std_close_threadpool_work(PTP_WORK work) { TRACE("(%p)\n", work); diff --git a/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec b/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec index 5b03b7ccfe8..bb4edfb76e5 100644 --- a/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec +++ b/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec @@ -11,7 +11,7 @@ @ stub __std_atomic_wait_get_deadline @ stub __std_atomic_wait_get_remaining_timeout @ stub __std_atomic_wait_indirect -@ stub __std_bulk_submit_threadpool_work +@ stdcall __std_bulk_submit_threadpool_work(ptr long) @ stub __std_calloc_crt @ stdcall __std_close_threadpool_work(ptr) @ stdcall __std_create_threadpool_work(ptr ptr ptr) diff --git a/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c b/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c index f67270fe3b5..3a971bb4ce3 100644 --- a/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c +++ b/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c @@ -24,6 +24,7 @@ static unsigned int (__stdcall *p___std_parallel_algorithms_hw_threads)(void); +static void (__stdcall *p___std_bulk_submit_threadpool_work)(PTP_WORK, size_t); static void (__stdcall *p___std_close_threadpool_work)(PTP_WORK); static PTP_WORK (__stdcall *p___std_create_threadpool_work)(PTP_WORK_CALLBACK, void*, PTP_CALLBACK_ENVIRON); static void (__stdcall *p___std_submit_threadpool_work)(PTP_WORK); @@ -40,6 +41,7 @@ static HMODULE init(void) SET(p___std_parallel_algorithms_hw_threads, "__std_parallel_algorithms_hw_threads"); + SET(p___std_bulk_submit_threadpool_work, "__std_bulk_submit_threadpool_work"); SET(p___std_close_threadpool_work, "__std_close_threadpool_work"); SET(p___std_create_threadpool_work, "__std_create_threadpool_work"); SET(p___std_submit_threadpool_work, "__std_submit_threadpool_work"); @@ -86,6 +88,7 @@ static void test_threadpool_work(void) if (0) /* crash on windows */ { + p___std_bulk_submit_threadpool_work(NULL, 5); p___std_create_threadpool_work(NULL, NULL, NULL); p___std_submit_threadpool_work(NULL); p___std_wait_for_threadpool_work_callbacks(NULL, FALSE); @@ -103,6 +106,23 @@ static void test_threadpool_work(void) ok(cb_work == work, "expected %p, got %p\n", work, cb_work); ok(cb_context == &workcalled, "expected %p, got %p\n", &workcalled, cb_context); + /* bulk submit */ + workcalled = 0; + work = p___std_create_threadpool_work(threadpool_workcallback, &workcalled, NULL); + ok(!!work, "failed to create threadpool_work\n"); + p___std_bulk_submit_threadpool_work(work, 13); + p___std_wait_for_threadpool_work_callbacks(work, FALSE); + p___std_close_threadpool_work(work); + ok(workcalled == 13, "expected work to be called 13 times, got %d\n", workcalled); + + workcalled = 0; + work = p___std_create_threadpool_work(threadpool_workcallback, &workcalled, NULL); + ok(!!work, "failed to create threadpool_work\n"); + p___std_bulk_submit_threadpool_work(work, 0); + p___std_wait_for_threadpool_work_callbacks(work, FALSE); + p___std_close_threadpool_work(work); + ok(workcalled == 0, "expected no work, got %d\n", workcalled); + /* test with environment */ cb_event = CreateEventW(NULL, TRUE, FALSE, NULL); memset(&environment, 0, sizeof(environment));

1 0

Daniel Lehman : msvcp140_atomic_wait: Implement __std_close_threadpool_work.
by Alexandre Julliard 28 Jan '22

28 Jan '22

Module: wine Branch: master Commit: 69debac78681812b7dff36b9056ef6cd375e387b URL: https://source.winehq.org/git/wine.git/?a=commit;h=69debac78681812b7dff36b9… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Jan 28 16:19:11 2022 +0100 msvcp140_atomic_wait: Implement __std_close_threadpool_work. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140_atomic_wait/main.c | 6 ++++++ dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec | 2 +- dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c | 9 ++++++--- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/msvcp140_atomic_wait/main.c b/dlls/msvcp140_atomic_wait/main.c index 28e86b93d7d..c00ed08bffe 100644 --- a/dlls/msvcp140_atomic_wait/main.c +++ b/dlls/msvcp140_atomic_wait/main.c @@ -31,6 +31,12 @@ unsigned int __stdcall __std_parallel_algorithms_hw_threads(void) return _Thrd_hardware_concurrency(); } +void __stdcall __std_close_threadpool_work(PTP_WORK work) +{ + TRACE("(%p)\n", work); + return CloseThreadpoolWork(work); +} + PTP_WORK __stdcall __std_create_threadpool_work(PTP_WORK_CALLBACK callback, void *context, PTP_CALLBACK_ENVIRON environ) { diff --git a/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec b/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec index cc8bc0e404e..5b03b7ccfe8 100644 --- a/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec +++ b/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec @@ -13,7 +13,7 @@ @ stub __std_atomic_wait_indirect @ stub __std_bulk_submit_threadpool_work @ stub __std_calloc_crt -@ stub __std_close_threadpool_work +@ stdcall __std_close_threadpool_work(ptr) @ stdcall __std_create_threadpool_work(ptr ptr ptr) @ stub __std_execution_wait_on_uchar @ stub __std_execution_wake_by_address_all diff --git a/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c b/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c index a7ba1dc76ea..f67270fe3b5 100644 --- a/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c +++ b/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c @@ -24,6 +24,7 @@ static unsigned int (__stdcall *p___std_parallel_algorithms_hw_threads)(void); +static void (__stdcall *p___std_close_threadpool_work)(PTP_WORK); static PTP_WORK (__stdcall *p___std_create_threadpool_work)(PTP_WORK_CALLBACK, void*, PTP_CALLBACK_ENVIRON); static void (__stdcall *p___std_submit_threadpool_work)(PTP_WORK); static void (__stdcall *p___std_wait_for_threadpool_work_callbacks)(PTP_WORK, BOOL); @@ -39,6 +40,7 @@ static HMODULE init(void) SET(p___std_parallel_algorithms_hw_threads, "__std_parallel_algorithms_hw_threads"); + SET(p___std_close_threadpool_work, "__std_close_threadpool_work"); SET(p___std_create_threadpool_work, "__std_create_threadpool_work"); SET(p___std_submit_threadpool_work, "__std_submit_threadpool_work"); SET(p___std_wait_for_threadpool_work_callbacks, "__std_wait_for_threadpool_work_callbacks"); @@ -87,6 +89,7 @@ static void test_threadpool_work(void) p___std_create_threadpool_work(NULL, NULL, NULL); p___std_submit_threadpool_work(NULL); p___std_wait_for_threadpool_work_callbacks(NULL, FALSE); + p___std_close_threadpool_work(NULL); } /* simple test */ @@ -95,7 +98,7 @@ static void test_threadpool_work(void) ok(!!work, "failed to create threadpool_work\n"); p___std_submit_threadpool_work(work); p___std_wait_for_threadpool_work_callbacks(work, FALSE); - CloseThreadpoolWork(work); + p___std_close_threadpool_work(work); ok(workcalled == 1, "expected work to be called once, got %d\n", workcalled); ok(cb_work == work, "expected %p, got %p\n", work, cb_work); ok(cb_context == &workcalled, "expected %p, got %p\n", &workcalled, cb_context); @@ -110,7 +113,7 @@ static void test_threadpool_work(void) ok(!!work, "failed to create threadpool_work\n"); p___std_submit_threadpool_work(work); p___std_wait_for_threadpool_work_callbacks(work, FALSE); - CloseThreadpoolWork(work); + p___std_close_threadpool_work(work); ret = WaitForSingleObject(cb_event, 1000); ok(ret == WAIT_OBJECT_0, "expected finalization callback to be called\n"); ok(workcalled == 2, "expected work to be called twice, got %d\n", workcalled); @@ -126,7 +129,7 @@ static void test_threadpool_work(void) gle = GetLastError(); ok(gle == 0xdeadbeef, "expected 0xdeadbeef, got %x\n", gle); ok(!!work, "failed to create threadpool_work\n"); - CloseThreadpoolWork(work); + p___std_close_threadpool_work(work); memset(&environment3, 0, sizeof(environment3)); environment3.Version = 3;

1 0

Daniel Lehman : msvcp140_atomic_wait: Implement __std_wait_for_threadpool_work_callbacks.
by Alexandre Julliard 28 Jan '22

28 Jan '22

Module: wine Branch: master Commit: 61a5fe51addd146c34f0dd4e034b38312c28dad0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=61a5fe51addd146c34f0dd4e… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Jan 28 16:19:03 2022 +0100 msvcp140_atomic_wait: Implement __std_wait_for_threadpool_work_callbacks. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140_atomic_wait/main.c | 6 ++++++ dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec | 2 +- dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c | 7 +++++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp140_atomic_wait/main.c b/dlls/msvcp140_atomic_wait/main.c index 1f5440b248a..28e86b93d7d 100644 --- a/dlls/msvcp140_atomic_wait/main.c +++ b/dlls/msvcp140_atomic_wait/main.c @@ -43,3 +43,9 @@ void __stdcall __std_submit_threadpool_work(PTP_WORK work) TRACE("(%p)\n", work); return SubmitThreadpoolWork(work); } + +void __stdcall __std_wait_for_threadpool_work_callbacks(PTP_WORK work, BOOL cancel) +{ + TRACE("(%p %d)\n", work, cancel); + return WaitForThreadpoolWorkCallbacks(work, cancel); +} diff --git a/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec b/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec index d5c9b45a119..cc8bc0e404e 100644 --- a/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec +++ b/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec @@ -29,4 +29,4 @@ @ stub __std_tzdb_get_leap_seconds @ stub __std_tzdb_get_sys_info @ stub __std_tzdb_get_time_zones -@ stub __std_wait_for_threadpool_work_callbacks +@ stdcall __std_wait_for_threadpool_work_callbacks(ptr long) diff --git a/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c b/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c index 0e707e9be44..a7ba1dc76ea 100644 --- a/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c +++ b/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c @@ -26,6 +26,7 @@ static unsigned int (__stdcall *p___std_parallel_algorithms_hw_threads)(void); static PTP_WORK (__stdcall *p___std_create_threadpool_work)(PTP_WORK_CALLBACK, void*, PTP_CALLBACK_ENVIRON); static void (__stdcall *p___std_submit_threadpool_work)(PTP_WORK); +static void (__stdcall *p___std_wait_for_threadpool_work_callbacks)(PTP_WORK, BOOL); #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) @@ -40,6 +41,7 @@ static HMODULE init(void) SET(p___std_create_threadpool_work, "__std_create_threadpool_work"); SET(p___std_submit_threadpool_work, "__std_submit_threadpool_work"); + SET(p___std_wait_for_threadpool_work_callbacks, "__std_wait_for_threadpool_work_callbacks"); return msvcp; } @@ -84,6 +86,7 @@ static void test_threadpool_work(void) { p___std_create_threadpool_work(NULL, NULL, NULL); p___std_submit_threadpool_work(NULL); + p___std_wait_for_threadpool_work_callbacks(NULL, FALSE); } /* simple test */ @@ -91,7 +94,7 @@ static void test_threadpool_work(void) work = p___std_create_threadpool_work(threadpool_workcallback, &workcalled, NULL); ok(!!work, "failed to create threadpool_work\n"); p___std_submit_threadpool_work(work); - WaitForThreadpoolWorkCallbacks(work, FALSE); + p___std_wait_for_threadpool_work_callbacks(work, FALSE); CloseThreadpoolWork(work); ok(workcalled == 1, "expected work to be called once, got %d\n", workcalled); ok(cb_work == work, "expected %p, got %p\n", work, cb_work); @@ -106,7 +109,7 @@ static void test_threadpool_work(void) work = p___std_create_threadpool_work(threadpool_workcallback, &workcalled, &environment); ok(!!work, "failed to create threadpool_work\n"); p___std_submit_threadpool_work(work); - WaitForThreadpoolWorkCallbacks(work, FALSE); + p___std_wait_for_threadpool_work_callbacks(work, FALSE); CloseThreadpoolWork(work); ret = WaitForSingleObject(cb_event, 1000); ok(ret == WAIT_OBJECT_0, "expected finalization callback to be called\n");

1 0

Daniel Lehman : msvcp140_atomic_wait: Implement __std_submit_threadpool_work.
by Alexandre Julliard 28 Jan '22

28 Jan '22

Module: wine Branch: master Commit: 68ad71a072d355bf8b4caec996e84a4fbd277059 URL: https://source.winehq.org/git/wine.git/?a=commit;h=68ad71a072d355bf8b4caec9… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Jan 28 16:18:58 2022 +0100 msvcp140_atomic_wait: Implement __std_submit_threadpool_work. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140_atomic_wait/main.c | 6 ++++++ dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec | 2 +- dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c | 7 +++++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp140_atomic_wait/main.c b/dlls/msvcp140_atomic_wait/main.c index bdc46412771..1f5440b248a 100644 --- a/dlls/msvcp140_atomic_wait/main.c +++ b/dlls/msvcp140_atomic_wait/main.c @@ -37,3 +37,9 @@ PTP_WORK __stdcall __std_create_threadpool_work(PTP_WORK_CALLBACK callback, void TRACE("(%p %p %p)\n", callback, context, environ); return CreateThreadpoolWork(callback, context, environ); } + +void __stdcall __std_submit_threadpool_work(PTP_WORK work) +{ + TRACE("(%p)\n", work); + return SubmitThreadpoolWork(work); +} diff --git a/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec b/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec index 3b4fd48dc7f..d5c9b45a119 100644 --- a/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec +++ b/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec @@ -20,7 +20,7 @@ @ stub __std_free_crt @ stdcall __std_parallel_algorithms_hw_threads() @ stub __std_release_shared_mutex_for_instance -@ stub __std_submit_threadpool_work +@ stdcall __std_submit_threadpool_work(ptr) @ stub __std_tzdb_delete_current_zone @ stub __std_tzdb_delete_leap_seconds @ stub __std_tzdb_delete_sys_info diff --git a/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c b/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c index 097a81e5029..0e707e9be44 100644 --- a/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c +++ b/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c @@ -25,6 +25,7 @@ static unsigned int (__stdcall *p___std_parallel_algorithms_hw_threads)(void); static PTP_WORK (__stdcall *p___std_create_threadpool_work)(PTP_WORK_CALLBACK, void*, PTP_CALLBACK_ENVIRON); +static void (__stdcall *p___std_submit_threadpool_work)(PTP_WORK); #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) @@ -38,6 +39,7 @@ static HMODULE init(void) SET(p___std_parallel_algorithms_hw_threads, "__std_parallel_algorithms_hw_threads"); SET(p___std_create_threadpool_work, "__std_create_threadpool_work"); + SET(p___std_submit_threadpool_work, "__std_submit_threadpool_work"); return msvcp; } @@ -81,13 +83,14 @@ static void test_threadpool_work(void) if (0) /* crash on windows */ { p___std_create_threadpool_work(NULL, NULL, NULL); + p___std_submit_threadpool_work(NULL); } /* simple test */ workcalled = 0; work = p___std_create_threadpool_work(threadpool_workcallback, &workcalled, NULL); ok(!!work, "failed to create threadpool_work\n"); - SubmitThreadpoolWork(work); + p___std_submit_threadpool_work(work); WaitForThreadpoolWorkCallbacks(work, FALSE); CloseThreadpoolWork(work); ok(workcalled == 1, "expected work to be called once, got %d\n", workcalled); @@ -102,7 +105,7 @@ static void test_threadpool_work(void) workcalled = 0; work = p___std_create_threadpool_work(threadpool_workcallback, &workcalled, &environment); ok(!!work, "failed to create threadpool_work\n"); - SubmitThreadpoolWork(work); + p___std_submit_threadpool_work(work); WaitForThreadpoolWorkCallbacks(work, FALSE); CloseThreadpoolWork(work); ret = WaitForSingleObject(cb_event, 1000);

1 0

Daniel Lehman : msvcp140_atomic_wait: Implement __std_create_threadpool_work.
by Alexandre Julliard 28 Jan '22

28 Jan '22

Module: wine Branch: master Commit: f1e995f020c3cee99fc11bebde8892637ca9b3a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1e995f020c3cee99fc11beb… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Jan 28 16:18:51 2022 +0100 msvcp140_atomic_wait: Implement __std_create_threadpool_work. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140_atomic_wait/main.c | 7 +++++++ dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec | 2 +- dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c | 17 +++++++++++++---- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/dlls/msvcp140_atomic_wait/main.c b/dlls/msvcp140_atomic_wait/main.c index 5c430ffd959..bdc46412771 100644 --- a/dlls/msvcp140_atomic_wait/main.c +++ b/dlls/msvcp140_atomic_wait/main.c @@ -30,3 +30,10 @@ unsigned int __stdcall __std_parallel_algorithms_hw_threads(void) TRACE("()\n"); return _Thrd_hardware_concurrency(); } + +PTP_WORK __stdcall __std_create_threadpool_work(PTP_WORK_CALLBACK callback, void *context, + PTP_CALLBACK_ENVIRON environ) +{ + TRACE("(%p %p %p)\n", callback, context, environ); + return CreateThreadpoolWork(callback, context, environ); +} diff --git a/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec b/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec index 1e5d1a5128b..3b4fd48dc7f 100644 --- a/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec +++ b/dlls/msvcp140_atomic_wait/msvcp140_atomic_wait.spec @@ -14,7 +14,7 @@ @ stub __std_bulk_submit_threadpool_work @ stub __std_calloc_crt @ stub __std_close_threadpool_work -@ stub __std_create_threadpool_work +@ stdcall __std_create_threadpool_work(ptr ptr ptr) @ stub __std_execution_wait_on_uchar @ stub __std_execution_wake_by_address_all @ stub __std_free_crt diff --git a/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c b/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c index e0dfef3222d..097a81e5029 100644 --- a/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c +++ b/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c @@ -24,6 +24,8 @@ static unsigned int (__stdcall *p___std_parallel_algorithms_hw_threads)(void); +static PTP_WORK (__stdcall *p___std_create_threadpool_work)(PTP_WORK_CALLBACK, void*, PTP_CALLBACK_ENVIRON); + #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) #define SET(x,y) do { SETNOFAIL(x,y); ok(x != NULL, "Export '%s' not found\n", y); } while(0) static HMODULE init(void) @@ -34,6 +36,8 @@ static HMODULE init(void) return NULL; SET(p___std_parallel_algorithms_hw_threads, "__std_parallel_algorithms_hw_threads"); + + SET(p___std_create_threadpool_work, "__std_create_threadpool_work"); return msvcp; } @@ -74,9 +78,14 @@ static void test_threadpool_work(void) TP_CALLBACK_ENVIRON environment; TP_CALLBACK_ENVIRON_V3 environment3; + if (0) /* crash on windows */ + { + p___std_create_threadpool_work(NULL, NULL, NULL); + } + /* simple test */ workcalled = 0; - work = CreateThreadpoolWork(threadpool_workcallback, &workcalled, NULL); + work = p___std_create_threadpool_work(threadpool_workcallback, &workcalled, NULL); ok(!!work, "failed to create threadpool_work\n"); SubmitThreadpoolWork(work); WaitForThreadpoolWorkCallbacks(work, FALSE); @@ -91,7 +100,7 @@ static void test_threadpool_work(void) environment.Version = 1; environment.FinalizationCallback = threadpool_workfinalization; workcalled = 0; - work = CreateThreadpoolWork(threadpool_workcallback, &workcalled, &environment); + work = p___std_create_threadpool_work(threadpool_workcallback, &workcalled, &environment); ok(!!work, "failed to create threadpool_work\n"); SubmitThreadpoolWork(work); WaitForThreadpoolWorkCallbacks(work, FALSE); @@ -106,7 +115,7 @@ static void test_threadpool_work(void) environment3.Version = 3; environment3.CallbackPriority = TP_CALLBACK_PRIORITY_NORMAL; SetLastError(0xdeadbeef); - work = CreateThreadpoolWork(threadpool_workcallback, &workcalled, + work = p___std_create_threadpool_work(threadpool_workcallback, &workcalled, (TP_CALLBACK_ENVIRON *)&environment3); gle = GetLastError(); ok(gle == 0xdeadbeef, "expected 0xdeadbeef, got %x\n", gle); @@ -117,7 +126,7 @@ static void test_threadpool_work(void) environment3.Version = 3; environment3.CallbackPriority = TP_CALLBACK_PRIORITY_INVALID; SetLastError(0xdeadbeef); - work = CreateThreadpoolWork(threadpool_workcallback, &workcalled, + work = p___std_create_threadpool_work(threadpool_workcallback, &workcalled, (TP_CALLBACK_ENVIRON *)&environment3); gle = GetLastError(); ok(gle == ERROR_INVALID_PARAMETER, "expected %d, got %d\n", ERROR_INVALID_PARAMETER, gle);

1 0

Daniel Lehman : msvcp140_atomic_wait/tests: Add test for threadpool_work functions.
by Alexandre Julliard 28 Jan '22

28 Jan '22

Module: wine Branch: master Commit: 2b6a1c003c08cc1ff58106c2acf777f5c2e17daf URL: https://source.winehq.org/git/wine.git/?a=commit;h=2b6a1c003c08cc1ff58106c2… Author: Daniel Lehman <dlehman(a)esri.com> Date: Fri Jan 28 16:18:44 2022 +0100 msvcp140_atomic_wait/tests: Add test for threadpool_work functions. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../tests/msvcp140_atomic_wait.c | 78 ++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c b/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c index aee852afd98..e0dfef3222d 100644 --- a/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c +++ b/dlls/msvcp140_atomic_wait/tests/msvcp140_atomic_wait.c @@ -47,6 +47,83 @@ static void test___std_parallel_algorithms_hw_threads(void) ok(nthr == si.dwNumberOfProcessors, "expected %u, got %u\n", si.dwNumberOfProcessors, nthr); } +static PTP_WORK cb_work; +static void *cb_context; +static void WINAPI threadpool_workcallback(PTP_CALLBACK_INSTANCE instance, void *context, PTP_WORK work) { + LONG *workcalled = context; + cb_work = work; + cb_context = context; + + InterlockedIncrement(workcalled); +} + +static HANDLE cb_event; +static void CALLBACK threadpool_workfinalization(TP_CALLBACK_INSTANCE *instance, void *context) +{ + LONG *workcalled = context; + + InterlockedIncrement(workcalled); + SetEvent(cb_event); +} + +static void test_threadpool_work(void) +{ + PTP_WORK work; + DWORD gle, ret; + LONG workcalled; + TP_CALLBACK_ENVIRON environment; + TP_CALLBACK_ENVIRON_V3 environment3; + + /* simple test */ + workcalled = 0; + work = CreateThreadpoolWork(threadpool_workcallback, &workcalled, NULL); + ok(!!work, "failed to create threadpool_work\n"); + SubmitThreadpoolWork(work); + WaitForThreadpoolWorkCallbacks(work, FALSE); + CloseThreadpoolWork(work); + ok(workcalled == 1, "expected work to be called once, got %d\n", workcalled); + ok(cb_work == work, "expected %p, got %p\n", work, cb_work); + ok(cb_context == &workcalled, "expected %p, got %p\n", &workcalled, cb_context); + + /* test with environment */ + cb_event = CreateEventW(NULL, TRUE, FALSE, NULL); + memset(&environment, 0, sizeof(environment)); + environment.Version = 1; + environment.FinalizationCallback = threadpool_workfinalization; + workcalled = 0; + work = CreateThreadpoolWork(threadpool_workcallback, &workcalled, &environment); + ok(!!work, "failed to create threadpool_work\n"); + SubmitThreadpoolWork(work); + WaitForThreadpoolWorkCallbacks(work, FALSE); + CloseThreadpoolWork(work); + ret = WaitForSingleObject(cb_event, 1000); + ok(ret == WAIT_OBJECT_0, "expected finalization callback to be called\n"); + ok(workcalled == 2, "expected work to be called twice, got %d\n", workcalled); + CloseHandle(cb_event); + + /* test with environment version 3 */ + memset(&environment3, 0, sizeof(environment3)); + environment3.Version = 3; + environment3.CallbackPriority = TP_CALLBACK_PRIORITY_NORMAL; + SetLastError(0xdeadbeef); + work = CreateThreadpoolWork(threadpool_workcallback, &workcalled, + (TP_CALLBACK_ENVIRON *)&environment3); + gle = GetLastError(); + ok(gle == 0xdeadbeef, "expected 0xdeadbeef, got %x\n", gle); + ok(!!work, "failed to create threadpool_work\n"); + CloseThreadpoolWork(work); + + memset(&environment3, 0, sizeof(environment3)); + environment3.Version = 3; + environment3.CallbackPriority = TP_CALLBACK_PRIORITY_INVALID; + SetLastError(0xdeadbeef); + work = CreateThreadpoolWork(threadpool_workcallback, &workcalled, + (TP_CALLBACK_ENVIRON *)&environment3); + gle = GetLastError(); + ok(gle == ERROR_INVALID_PARAMETER, "expected %d, got %d\n", ERROR_INVALID_PARAMETER, gle); + ok(!work, "expected failure\n"); +} + START_TEST(msvcp140_atomic_wait) { HMODULE msvcp; @@ -56,5 +133,6 @@ START_TEST(msvcp140_atomic_wait) return; } test___std_parallel_algorithms_hw_threads(); + test_threadpool_work(); FreeLibrary(msvcp); }

1 0

Alex Henrie : user32: Send EVENT_OBJECT_FOCUS when the focus changes.
by Alexandre Julliard 28 Jan '22

28 Jan '22

Module: wine Branch: master Commit: ddfb6d518ee1e1bbd72e2effd10bc4850c225821 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddfb6d518ee1e1bbd72e2eff… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu Jan 27 22:56:24 2022 -0700 user32: Send EVENT_OBJECT_FOCUS when the focus changes. The NVDA screen reader needs this. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/focus.c | 3 ++ dlls/user32/tests/msg.c | 104 ++++++++++++++++++++++++------------------------ 2 files changed, 55 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ddfb6d518ee1e1bbd72e…

1 0

Zebediah Figura : wined3d: Introduce WINED3D_LOCATION_CLEARED and use it for the initial state of buffers.
by Alexandre Julliard 28 Jan '22

28 Jan '22

Module: wine Branch: master Commit: 1af6cb07b2d9a42200dcf776169df06b74a11fcf URL: https://source.winehq.org/git/wine.git/?a=commit;h=1af6cb07b2d9a42200dcf776… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jan 27 20:22:51 2022 -0600 wined3d: Introduce WINED3D_LOCATION_CLEARED and use it for the initial state of buffers. The practical effect of this is to defer clearing buffers until they are used. Under normal circumstances the buffer will be initially discarded, in which case we need not clear it at all, and may even avoid ever allocating sysmem. 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> --- dlls/wined3d/buffer.c | 31 +++++++++++++++++++++++-------- dlls/wined3d/utils.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 25 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index abbef0fac41..2f3b5fd316e 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -607,13 +607,28 @@ BOOL wined3d_buffer_load_location(struct wined3d_buffer *buffer, switch (location) { case WINED3D_LOCATION_SYSMEM: - range.offset = 0; - range.size = buffer->resource.size; - buffer->buffer_ops->buffer_download_ranges(buffer, context, - buffer->resource.heap_memory, 0, 1, &range); + if (buffer->locations & WINED3D_LOCATION_CLEARED) + { + memset(buffer->resource.heap_memory, 0, buffer->resource.size); + } + else + { + range.offset = 0; + range.size = buffer->resource.size; + buffer->buffer_ops->buffer_download_ranges(buffer, context, + buffer->resource.heap_memory, 0, 1, &range); + } break; case WINED3D_LOCATION_BUFFER: + if (buffer->locations & WINED3D_LOCATION_CLEARED) + { + /* FIXME: Clear the buffer on the GPU if possible. */ + if (!wined3d_buffer_prepare_location(buffer, context, WINED3D_LOCATION_SYSMEM)) + return FALSE; + memset(buffer->resource.heap_memory, 0, buffer->resource.size); + } + if (!buffer->conversion_map) buffer->buffer_ops->buffer_upload_ranges(buffer, context, buffer->resource.heap_memory, 0, buffer->modified_areas, buffer->maps); @@ -650,7 +665,7 @@ DWORD wined3d_buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_co TRACE("buffer %p, context %p, data %p, locations %s.\n", buffer, context, data, wined3d_debug_location(locations)); - if (locations & WINED3D_LOCATION_DISCARDED) + if (locations & (WINED3D_LOCATION_DISCARDED | WINED3D_LOCATION_CLEARED)) { locations = ((buffer->flags & WINED3D_BUFFER_USE_BO) ? WINED3D_LOCATION_BUFFER : WINED3D_LOCATION_SYSMEM); if (!wined3d_buffer_load_location(buffer, context, locations)) @@ -949,7 +964,7 @@ static HRESULT buffer_resource_sub_resource_map(struct wined3d_resource *resourc } if (flags & WINED3D_MAP_WRITE) - wined3d_buffer_invalidate_range(buffer, WINED3D_LOCATION_BUFFER, dirty_offset, dirty_size); + wined3d_buffer_invalidate_range(buffer, ~WINED3D_LOCATION_SYSMEM, dirty_offset, dirty_size); } else { @@ -971,7 +986,7 @@ static HRESULT buffer_resource_sub_resource_map(struct wined3d_resource *resourc if (flags & WINED3D_MAP_WRITE) { - wined3d_buffer_invalidate_location(buffer, WINED3D_LOCATION_SYSMEM); + wined3d_buffer_invalidate_location(buffer, ~WINED3D_LOCATION_BUFFER); buffer_invalidate_bo_range(buffer, dirty_offset, dirty_size); } @@ -1241,7 +1256,7 @@ static HRESULT wined3d_buffer_init(struct wined3d_buffer *buffer, struct wined3d } buffer->buffer_ops = buffer_ops; buffer->structure_byte_stride = desc->structure_byte_stride; - buffer->locations = data ? WINED3D_LOCATION_DISCARDED : WINED3D_LOCATION_SYSMEM; + buffer->locations = WINED3D_LOCATION_CLEARED; TRACE("buffer %p, size %#x, usage %#x, memory @ %p.\n", buffer, buffer->resource.size, buffer->resource.usage, buffer->resource.heap_memory); diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index e50d42ead92..bf9ae11ea13 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -6864,6 +6864,7 @@ const char *wined3d_debug_location(DWORD location) #define LOCATION_TO_STR(x) if (location & x) { debug_append(&buffer, #x, " | "); location &= ~x; } LOCATION_TO_STR(WINED3D_LOCATION_DISCARDED); LOCATION_TO_STR(WINED3D_LOCATION_SYSMEM); + LOCATION_TO_STR(WINED3D_LOCATION_CLEARED); LOCATION_TO_STR(WINED3D_LOCATION_BUFFER); LOCATION_TO_STR(WINED3D_LOCATION_TEXTURE_RGB); LOCATION_TO_STR(WINED3D_LOCATION_TEXTURE_SRGB); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e28fc3b880d..1b3a13024f9 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4316,6 +4316,7 @@ void wined3d_resource_update_draw_binding(struct wined3d_resource *resource) DEC #define WINED3D_LOCATION_DISCARDED 0x00000001 #define WINED3D_LOCATION_SYSMEM 0x00000002 +#define WINED3D_LOCATION_CLEARED 0x00000004 #define WINED3D_LOCATION_BUFFER 0x00000008 #define WINED3D_LOCATION_TEXTURE_RGB 0x00000010 #define WINED3D_LOCATION_TEXTURE_SRGB 0x00000020

1 0

Zebediah Figura : wined3d: Prefer mapping a BO if the buffer has WINED3D_BUFFER_USE_BO set.
by Alexandre Julliard 28 Jan '22

28 Jan '22

Module: wine Branch: master Commit: 6b96021a1cfa1680482a99123f594fe5b87a0c88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b96021a1cfa1680482a9912… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Jan 27 20:22:50 2022 -0600 wined3d: Prefer mapping a BO if the buffer has WINED3D_BUFFER_USE_BO set. Instead of checking whether a BO already exists. This will end up allocating a BO earlier in some cases. This is not particularly impactful by itself, since we already would have sysmem available and thus could use it without a performance penalty. However, we would like to avoid ever allocating sysmem where not necessary, in particular by deferring allocation of any location at all until the resource is written to. This also has the side effect of fixing test_map_synchronization() on 64-bit architectures, broken since 194b47b4fd92dda8ebf24e88ca7a14fc926c84ab. The test creates a buffer, maps it once, then maps it again with NOOVERWRITE while the GPU is still drawing, expecting the new data to be read by the GPU during the draw. On 32-bit machines, and 64-bit machines before the offending commit, we do the following: First map: uses SYSMEM since the BO is not created yet Draw: upload to VBO Second map: map the existing VBO with GL_MAP_UNSYNCHRONIZED_BIT After 194b47b4fd9, we don't use GL_MAP_UNSYNCHRONIZED_BIT since the buffer has READ access, which means that the second map will be synchronized and wait for the draw to complete. After this patch, we do the following: First map: create and map a VBO (not unsynchronized, but coherent and persistently mapped) Draw: use mapped VBO Second map: write to existing (coherent) VBO, which is unsynchronized 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> --- dlls/wined3d/buffer.c | 139 ++++++++++++++++++++++++++------------------------ 1 file changed, 72 insertions(+), 67 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 3d66af3e5e6..abbef0fac41 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -911,105 +911,110 @@ static HRESULT buffer_resource_sub_resource_map(struct wined3d_resource *resourc void **map_ptr, const struct wined3d_box *box, uint32_t flags) { struct wined3d_buffer *buffer = buffer_from_resource(resource); + unsigned int offset, size, dirty_offset, dirty_size; struct wined3d_device *device = resource->device; struct wined3d_context *context; - unsigned int offset, size; + struct wined3d_bo_address addr; uint8_t *base; LONG count; TRACE("resource %p, sub_resource_idx %u, map_ptr %p, box %s, flags %#x.\n", resource, sub_resource_idx, map_ptr, debug_box(box), flags); - offset = box->left; - size = box->right - box->left; + dirty_offset = offset = box->left; + dirty_size = size = box->right - box->left; count = ++resource->map_count; - if (buffer->buffer_object) + /* DISCARD invalidates the entire buffer, regardless of the specified + * offset and size. Some applications also depend on the entire buffer + * being uploaded in that case. Two such applications are Port Royale + * and Darkstar One. */ + if (flags & WINED3D_MAP_DISCARD) { - unsigned int dirty_offset = offset, dirty_size = size; - struct wined3d_bo_address addr; + dirty_offset = 0; + dirty_size = 0; + } - /* DISCARD invalidates the entire buffer, regardless of the specified - * offset and size. Some applications also depend on the entire buffer - * being uploaded in that case. Two such applications are Port Royale - * and Darkstar One. */ - if (flags & WINED3D_MAP_DISCARD) + if (((flags & WINED3D_MAP_WRITE) && !(flags & (WINED3D_MAP_NOOVERWRITE | WINED3D_MAP_DISCARD))) + || (!(flags & WINED3D_MAP_WRITE) && (buffer->locations & WINED3D_LOCATION_SYSMEM)) + || buffer->flags & WINED3D_BUFFER_PIN_SYSMEM + || !(buffer->flags & WINED3D_BUFFER_USE_BO)) + { + if (!(buffer->locations & WINED3D_LOCATION_SYSMEM)) { - dirty_offset = 0; - dirty_size = 0; + context = context_acquire(device, NULL, 0); + wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM); + context_release(context); } - if (((flags & WINED3D_MAP_WRITE) && !(flags & (WINED3D_MAP_NOOVERWRITE | WINED3D_MAP_DISCARD))) - || (!(flags & WINED3D_MAP_WRITE) && (buffer->locations & WINED3D_LOCATION_SYSMEM)) - || buffer->flags & WINED3D_BUFFER_PIN_SYSMEM) + if (flags & WINED3D_MAP_WRITE) + wined3d_buffer_invalidate_range(buffer, WINED3D_LOCATION_BUFFER, dirty_offset, dirty_size); + } + else + { + context = context_acquire(device, NULL, 0); + + if (flags & WINED3D_MAP_DISCARD) { - if (!(buffer->locations & WINED3D_LOCATION_SYSMEM)) + if (!wined3d_buffer_prepare_location(buffer, context, WINED3D_LOCATION_BUFFER)) { - context = context_acquire(device, NULL, 0); - wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM); context_release(context); + return E_OUTOFMEMORY; } - - if (flags & WINED3D_MAP_WRITE) - wined3d_buffer_invalidate_range(buffer, WINED3D_LOCATION_BUFFER, dirty_offset, dirty_size); + wined3d_buffer_validate_location(buffer, WINED3D_LOCATION_BUFFER); } else { - context = context_acquire(device, NULL, 0); + wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_BUFFER); + } - if (flags & WINED3D_MAP_DISCARD) - wined3d_buffer_validate_location(buffer, WINED3D_LOCATION_BUFFER); - else - wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_BUFFER); + if (flags & WINED3D_MAP_WRITE) + { + wined3d_buffer_invalidate_location(buffer, WINED3D_LOCATION_SYSMEM); + buffer_invalidate_bo_range(buffer, dirty_offset, dirty_size); + } - if (flags & WINED3D_MAP_WRITE) + if ((flags & WINED3D_MAP_DISCARD) && resource->heap_memory) + wined3d_buffer_evict_sysmem(buffer); + + if (count == 1) + { + addr.buffer_object = buffer->buffer_object; + addr.addr = 0; + buffer->map_ptr = wined3d_context_map_bo_address(context, &addr, resource->size, flags); + /* We are accessing buffer->resource.client from the CS thread, + * but it's safe because the client thread will wait for the + * map to return, thus completely serializing this call with + * other client code. */ + buffer->resource.client.addr = addr; + + if (((DWORD_PTR)buffer->map_ptr) & (RESOURCE_ALIGNMENT - 1)) { - wined3d_buffer_invalidate_location(buffer, WINED3D_LOCATION_SYSMEM); - buffer_invalidate_bo_range(buffer, dirty_offset, dirty_size); - } + WARN("Pointer %p is not %u byte aligned.\n", buffer->map_ptr, RESOURCE_ALIGNMENT); - if ((flags & WINED3D_MAP_DISCARD) && resource->heap_memory) - wined3d_buffer_evict_sysmem(buffer); + wined3d_context_unmap_bo_address(context, &addr, 0, NULL); + buffer->map_ptr = NULL; - if (count == 1) - { - addr.buffer_object = buffer->buffer_object; - addr.addr = 0; - buffer->map_ptr = wined3d_context_map_bo_address(context, &addr, resource->size, flags); - /* We are accessing buffer->resource.client from the CS thread, - * but it's safe because the client thread will wait for the - * map to return, thus completely serializing this call with - * other client code. */ - buffer->resource.client.addr = addr; - - if (((DWORD_PTR)buffer->map_ptr) & (RESOURCE_ALIGNMENT - 1)) + if (resource->usage & WINED3DUSAGE_DYNAMIC) + { + /* The extra copy is more expensive than not using VBOs + * at all on the NVIDIA Linux driver, which is the + * only driver that returns unaligned pointers. */ + TRACE("Dynamic buffer, dropping VBO.\n"); + wined3d_buffer_drop_bo(buffer); + } + else { - WARN("Pointer %p is not %u byte aligned.\n", buffer->map_ptr, RESOURCE_ALIGNMENT); - - wined3d_context_unmap_bo_address(context, &addr, 0, NULL); - buffer->map_ptr = NULL; - - if (resource->usage & WINED3DUSAGE_DYNAMIC) - { - /* The extra copy is more expensive than not using VBOs - * at all on the NVIDIA Linux driver, which is the - * only driver that returns unaligned pointers. */ - TRACE("Dynamic buffer, dropping VBO.\n"); - wined3d_buffer_drop_bo(buffer); - } - else - { - TRACE("Falling back to doublebuffered operation.\n"); - wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM); - buffer->flags |= WINED3D_BUFFER_PIN_SYSMEM; - } - TRACE("New pointer is %p.\n", resource->heap_memory); + TRACE("Falling back to doublebuffered operation.\n"); + wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM); + buffer->flags |= WINED3D_BUFFER_PIN_SYSMEM; } + TRACE("New pointer is %p.\n", resource->heap_memory); } - - context_release(context); } + + context_release(context); } base = buffer->map_ptr ? buffer->map_ptr : resource->heap_memory;

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
73
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 January 2022