December 2023 - Wine-commits

Brendan McGrath : comctl32/tests: Check size initially and after changing padding only.
by Alexandre Julliard 08 Dec '23

08 Dec '23

Module: wine Branch: master Commit: 8934a53e6106f3c72ad0bb07e62f44e213e3ec2d URL: https://gitlab.winehq.org/wine/wine/-/commit/8934a53e6106f3c72ad0bb07e62f44… Author: Brendan McGrath <bmcgrath(a)codeweavers.com> Date: Mon Dec 4 10:30:46 2023 +1100 comctl32/tests: Check size initially and after changing padding only. --- dlls/comctl32/tests/tab.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index 91f2d4a7490..7fc9c83a67d 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -540,6 +540,7 @@ static void test_tab(INT nMinTabWidth) SelectObject(hdc, hOldFont); ReleaseDC(hwTab, hdc); + trace ("default_min_tab_width: %d\n", default_min_tab_width); trace (" TCS_FIXEDWIDTH tabs no icon...\n"); CHECKSIZE(hwTab, dpi, -1, "default width"); TABCHECKSETSIZE(hwTab, 50, 20, 50, 20, "set size"); @@ -609,6 +610,7 @@ static void test_tab(INT nMinTabWidth) ok( rTab.right - rTab.left == exp || broken(rTab.right - rTab.left == default_min_tab_width), "no icon, default width: Expected width [%d] got [%ld]\n", exp, rTab.right - rTab.left ); + CHECKSIZE(hwTab, max(size.cx + TAB_PADDING_X*2, nMinTabWidth < 0 ? default_min_tab_width : nMinTabWidth), size.cy + 5, "Initial values"); for (i=0; i<8; i++) { INT nTabWidth = (nMinTabWidth < 0) ? TabWidthPadded(default_min_tab_width, i, 2) : nMinTabWidth; @@ -625,6 +627,11 @@ static void test_tab(INT nMinTabWidth) TABCHECKSETSIZE(hwTab, 50, 30, max(size.cx + 21 + i*3, nTabWidth), 30, "with icon, set size > icon"); TABCHECKSETSIZE(hwTab, 20, 20, max(size.cx + 21 + i*3, nTabWidth), 20, "with icon, set size < icon"); TABCHECKSETSIZE(hwTab, 0, 1, max(size.cx + 21 + i*3, nTabWidth), 1, "with icon, min size"); + + /* tests that a change to padding only doesn't impact reported size */ + SendMessageA(hwTab, TCM_SETPADDING, 0, MAKELPARAM(i + 1, i + 1)); + CHECKSIZE(hwTab, max(size.cx + 21 + i*3, nTabWidth), 1, "with icon, min size, padding only change"); + TABCHECKSETSIZE(hwTab, 0, 1, max(size.cx + 21 + i*3, nTabWidth), 1, "with icon, min size, same size"); } DestroyWindow (hwTab); @@ -637,6 +644,7 @@ static void test_tab(INT nMinTabWidth) ok( rTab.right - rTab.left == exp || broken(rTab.right - rTab.left == default_min_tab_width), "no icon, default width: Expected width [%d] got [%ld]\n", exp, rTab.right - rTab.left ); + CHECKSIZE(hwTab, nMinTabWidth < 0 ? default_min_tab_width : nMinTabWidth, size.cy + 5, "Initial values"); for (i=0; i<8; i++) { INT nTabWidth = (nMinTabWidth < 0) ? TabWidthPadded(default_min_tab_width, i, 2) : nMinTabWidth; @@ -654,6 +662,11 @@ static void test_tab(INT nMinTabWidth) TABCHECKSETSIZE(hwTab, 50, 30, nTabWidth, 30, "with icon, set size > icon"); TABCHECKSETSIZE(hwTab, 20, 20, nTabWidth, 20, "with icon, set size < icon"); TABCHECKSETSIZE(hwTab, 0, 1, nTabWidth, 1, "with icon, min size"); + + /* tests that a change to padding only doesn't impact reported size */ + SendMessageA(hwTab, TCM_SETPADDING, 0, MAKELPARAM(i + 1, i + 1)); + CHECKSIZE(hwTab, nTabWidth, 1, "with icon, min size, padding only change"); + TABCHECKSETSIZE(hwTab, 0, 1, nTabWidth, 1, "with icon, min size, same size"); } DestroyWindow (hwTab);

1 0

Brendan McGrath : comctl32/tests: Modify test_width to try different fonts.
by Alexandre Julliard 08 Dec '23

08 Dec '23

Module: wine Branch: master Commit: 6a4fb894fe0306c6e2fbfdfec832dcf851a77e17 URL: https://gitlab.winehq.org/wine/wine/-/commit/6a4fb894fe0306c6e2fbfdfec832dc… Author: Brendan McGrath <bmcgrath(a)codeweavers.com> Date: Fri Nov 24 10:53:51 2023 +1100 comctl32/tests: Modify test_width to try different fonts. --- dlls/comctl32/tests/tab.c | 43 +++++++++++++++++++++++++++++++++---------- 1 file changed, 33 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/tests/tab.c b/dlls/comctl32/tests/tab.c index 7fc9c83a67d..6d38baae8a6 100644 --- a/dlls/comctl32/tests/tab.c +++ b/dlls/comctl32/tests/tab.c @@ -676,16 +676,39 @@ static void test_tab(INT nMinTabWidth) static void test_width(void) { - trace ("Testing with default MinWidth\n"); - test_tab(-1); - trace ("Testing with MinWidth set to -3\n"); - test_tab(-3); - trace ("Testing with MinWidth set to 24\n"); - test_tab(24); - trace ("Testing with MinWidth set to 54\n"); - test_tab(54); - trace ("Testing with MinWidth set to 94\n"); - test_tab(94); + HFONT oldFont = hFont; + const char *fonts[] = { + "System", + "Arial", + "Tahoma", + "Courier New", + "MS Shell Dlg", + }; + + LOGFONTA logfont = { + .lfHeight = -12, + .lfWeight = FW_NORMAL, + .lfCharSet = ANSI_CHARSET + }; + + for(int i = 0; i < sizeof(fonts)/sizeof(fonts[0]); i++) { + trace ("Testing with the '%s' font\n", fonts[i]); + lstrcpyA(logfont.lfFaceName, fonts[i]); + hFont = CreateFontIndirectA(&logfont); + + trace ("Testing with default MinWidth\n"); + test_tab(-1); + trace ("Testing with MinWidth set to -3\n"); + test_tab(-3); + trace ("Testing with MinWidth set to 24\n"); + test_tab(24); + trace ("Testing with MinWidth set to 54\n"); + test_tab(54); + trace ("Testing with MinWidth set to 94\n"); + test_tab(94); + } + + hFont = oldFont; } static void test_setitemsize(void)

1 0

Alexandros Frantzis : winewayland.drv: Apply surface configuration during Vulkan presentation.
by Alexandre Julliard 08 Dec '23

08 Dec '23

Module: wine Branch: master Commit: 157d54021b92d9066d8f59b37759b4d7145a3ff9 URL: https://gitlab.winehq.org/wine/wine/-/commit/157d54021b92d9066d8f59b37759b4… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Thu Dec 7 16:15:14 2023 +0200 winewayland.drv: Apply surface configuration during Vulkan presentation. When we have a Vulkan client subsurface, and depending on timings and window state (e.g., fullscreen), we may not get the chance to apply new surface configurations when presenting content to the main window surface. To ensure new configurations are applied, also check for and apply/ack configurations during Vulkan presentation. This fixes some games which resize when they become fullscreen, but are not properly placed by the compositor, because they never ack the fullscreen state. --- dlls/winewayland.drv/vulkan.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/winewayland.drv/vulkan.c b/dlls/winewayland.drv/vulkan.c index 86eb65afa46..294272a9788 100644 --- a/dlls/winewayland.drv/vulkan.c +++ b/dlls/winewayland.drv/vulkan.c @@ -270,6 +270,15 @@ static VkResult check_queue_present(const VkPresentInfoKHR *present_info, wayland_surface_ensure_contents(wayland_surface); + /* Handle any processed configure request, to ensure the related + * surface state is applied by the compositor. */ + if (wayland_surface->processing.serial && + wayland_surface->processing.processed && + wayland_surface_reconfigure(wayland_surface)) + { + wl_surface_commit(wayland_surface->wl_surface); + } + pthread_mutex_unlock(&wayland_surface->mutex); if (client_width == wine_vk_swapchain->extent.width &&

1 0

Nikolay Sivov : kernel32: Implement GetProcessInformation(ProcessMachineTypeInfo).
by Alexandre Julliard 08 Dec '23

08 Dec '23

Module: wine Branch: master Commit: f27b62206cf3ee11e933d46a62ed56828070eb3f URL: https://gitlab.winehq.org/wine/wine/-/commit/f27b62206cf3ee11e933d46a62ed56… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Dec 6 17:38:40 2023 +0100 kernel32: Implement GetProcessInformation(ProcessMachineTypeInfo). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/tests/process.c | 57 +++++++++++++++++++++++++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/process.c | 51 ++++++++++++++++++++++++++++++++++++ dlls/win32u/freetype.c | 2 ++ dlls/winemac.drv/macdrv_cocoa.h | 2 ++ dlls/winspool.drv/cups.c | 2 ++ include/winbase.h | 15 +++++++++++ 8 files changed, 131 insertions(+), 1 deletion(-)

1 0

Alex Henrie : explorer: Add an "Exit desktop" button to the Start menu.
by Alexandre Julliard 08 Dec '23

08 Dec '23

1 0

Zebediah Figura : wined3d: Use thread-ID alerts instead of events, if available, to wait for CS packets.
by Alexandre Julliard 08 Dec '23

08 Dec '23

Module: wine Branch: master Commit: c73359902c76ec7498bd8dc4d8877ac6bde6b673 URL: https://gitlab.winehq.org/wine/wine/-/commit/c73359902c76ec7498bd8dc4d8877a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Mar 11 18:06:31 2022 -0600 wined3d: Use thread-ID alerts instead of events, if available, to wait for CS packets. --- dlls/wined3d/cs.c | 33 +++++++++++++++++++++++++++------ 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index bf171326926..edc2feeaab2 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -24,6 +24,9 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); WINE_DECLARE_DEBUG_CHANNEL(d3d_sync); WINE_DECLARE_DEBUG_CHANNEL(fps); +static NTSTATUS (WINAPI *pNtAlertThreadByThreadId)(HANDLE tid); +static NTSTATUS (WINAPI *pNtWaitForAlertByThreadId)(void *addr, const LARGE_INTEGER *timeout); + #define WINED3D_INITIAL_CS_SIZE 4096 struct wined3d_deferred_upload @@ -3188,7 +3191,12 @@ static void wined3d_cs_queue_submit(struct wined3d_cs_queue *queue, struct wined InterlockedExchange((LONG *)&queue->head, queue->head + packet_size); if (InterlockedCompareExchange(&cs->waiting_for_event, FALSE, TRUE)) - SetEvent(cs->event); + { + if (pNtAlertThreadByThreadId) + pNtAlertThreadByThreadId((HANDLE)(ULONG_PTR)cs->thread_id); + else + SetEvent(cs->event); + } } static void wined3d_cs_mt_submit(struct wined3d_device_context *context, enum wined3d_cs_queue_id queue_id) @@ -3328,7 +3336,10 @@ static void wined3d_cs_wait_event(struct wined3d_cs *cs) && InterlockedCompareExchange(&cs->waiting_for_event, FALSE, TRUE)) return; - WaitForSingleObject(cs->event, INFINITE); + if (pNtWaitForAlertByThreadId) + pNtWaitForAlertByThreadId(NULL, NULL); + else + WaitForSingleObject(cs->event, INFINITE); } static void wined3d_cs_command_lock(const struct wined3d_cs *cs) @@ -3529,7 +3540,15 @@ struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device, { cs->c.ops = &wined3d_cs_mt_ops; - if (!(cs->event = CreateEventW(NULL, FALSE, FALSE, NULL))) + if (!pNtAlertThreadByThreadId) + { + HANDLE ntdll = GetModuleHandleW(L"ntdll.dll"); + + pNtAlertThreadByThreadId = (void *)GetProcAddress(ntdll, "NtAlertThreadByThreadId"); + pNtWaitForAlertByThreadId = (void *)GetProcAddress(ntdll, "NtWaitForAlertByThreadId"); + } + + if (!pNtAlertThreadByThreadId && !(cs->event = CreateEventW(NULL, FALSE, FALSE, NULL))) { ERR("Failed to create command stream event.\n"); heap_free(cs->data); @@ -3547,7 +3566,8 @@ struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device, { ERR("Failed to get wined3d module handle.\n"); CloseHandle(cs->present_event); - CloseHandle(cs->event); + if (cs->event) + CloseHandle(cs->event); heap_free(cs->data); goto fail; } @@ -3557,7 +3577,8 @@ struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device, ERR("Failed to create wined3d command stream thread.\n"); FreeLibrary(cs->wined3d_module); CloseHandle(cs->present_event); - CloseHandle(cs->event); + if (cs->event) + CloseHandle(cs->event); heap_free(cs->data); goto fail; } @@ -3581,7 +3602,7 @@ void wined3d_cs_destroy(struct wined3d_cs *cs) CloseHandle(cs->thread); if (!CloseHandle(cs->present_event)) ERR("Closing present event failed.\n"); - if (!CloseHandle(cs->event)) + if (cs->event && !CloseHandle(cs->event)) ERR("Closing event failed.\n"); }

1 0

Matteo Bruni : wined3d: Do a blocking wait for CS commands even when there are active queries.
by Alexandre Julliard 08 Dec '23

08 Dec '23

Module: wine Branch: master Commit: 7d247ca676a16d503dcee1c2a105ec641b1ecf7e URL: https://gitlab.winehq.org/wine/wine/-/commit/7d247ca676a16d503dcee1c2a105ec… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Mar 11 18:18:53 2022 -0600 wined3d: Do a blocking wait for CS commands even when there are active queries. Make sure we poll queries before we go to sleep, to e.g. avoid hangs in Rocket League. With significant contributions by Zebediah Figura. --- dlls/wined3d/cs.c | 16 +++++++++++----- dlls/wined3d/wined3d_private.h | 2 ++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index edc2feeaab2..61ea75c2776 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3322,6 +3322,12 @@ static void poll_queries(struct wined3d_cs *cs) static void wined3d_cs_wait_event(struct wined3d_cs *cs) { + static const LARGE_INTEGER query_timeout = {.QuadPart = WINED3D_CS_COMMAND_WAIT_WITH_QUERIES_TIMEOUT * -10}; + const LARGE_INTEGER *timeout = NULL; + + if (!list_empty(&cs->query_poll_list)) + timeout = &query_timeout; + InterlockedExchange(&cs->waiting_for_event, TRUE); /* The main thread might have enqueued a command and blocked on it after @@ -3337,9 +3343,9 @@ static void wined3d_cs_wait_event(struct wined3d_cs *cs) return; if (pNtWaitForAlertByThreadId) - pNtWaitForAlertByThreadId(NULL, NULL); + pNtWaitForAlertByThreadId(NULL, timeout); else - WaitForSingleObject(cs->event, INFINITE); + NtWaitForSingleObject(cs->event, FALSE, timeout); } static void wined3d_cs_command_lock(const struct wined3d_cs *cs) @@ -3451,10 +3457,10 @@ static DWORD WINAPI wined3d_cs_run(void *ctx) YieldProcessor(); if (++spin_count >= WINED3D_CS_SPIN_COUNT) { - if (list_empty(&cs->query_poll_list)) - wined3d_cs_wait_event(cs); + if (poll) + poll = WINED3D_CS_QUERY_POLL_INTERVAL - 1; else - Sleep(0); + wined3d_cs_wait_event(cs); } continue; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ea78312fef3..494d26ebd02 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3564,6 +3564,8 @@ enum wined3d_cs_queue_id #define WINED3D_CS_QUEUE_SIZE 0x400000u #endif #define WINED3D_CS_SPIN_COUNT 2000u +/* How long to wait for commands when there are active queries, in µs. */ +#define WINED3D_CS_COMMAND_WAIT_WITH_QUERIES_TIMEOUT 100 #define WINED3D_CS_QUEUE_MASK (WINED3D_CS_QUEUE_SIZE - 1) C_ASSERT(!(WINED3D_CS_QUEUE_SIZE & (WINED3D_CS_QUEUE_SIZE - 1)));

1 0

Zebediah Figura : wined3d: Sleep when waiting for the CS thread.
by Alexandre Julliard 08 Dec '23

08 Dec '23

Module: wine Branch: master Commit: ea48ac41e615368e29185748935031d906bb42af URL: https://gitlab.winehq.org/wine/wine/-/commit/ea48ac41e615368e29185748935031… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Mar 1 19:53:41 2022 -0600 wined3d: Sleep when waiting for the CS thread. --- dlls/wined3d/cs.c | 3 ++- dlls/wined3d/wined3d_private.h | 15 ++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 61ea75c2776..b704b720cd0 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -3284,12 +3284,13 @@ static void *wined3d_cs_mt_require_space(struct wined3d_device_context *context, static void wined3d_cs_mt_finish(struct wined3d_device_context *context, enum wined3d_cs_queue_id queue_id) { struct wined3d_cs *cs = wined3d_cs_from_context(context); + unsigned int spin_count = 0; if (cs->thread_id == GetCurrentThreadId()) return wined3d_cs_st_finish(context, queue_id); while (cs->queue[queue_id].head != *(volatile ULONG *)&cs->queue[queue_id].tail) - YieldProcessor(); + wined3d_pause(&spin_count); } static const struct wined3d_device_context_ops wined3d_cs_mt_ops = diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 494d26ebd02..64b933b2b45 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3566,6 +3566,8 @@ enum wined3d_cs_queue_id #define WINED3D_CS_SPIN_COUNT 2000u /* How long to wait for commands when there are active queries, in µs. */ #define WINED3D_CS_COMMAND_WAIT_WITH_QUERIES_TIMEOUT 100 +/* How long to wait for the CS from the client thread, in µs. */ +#define WINED3D_CS_CLIENT_WAIT_TIMEOUT 0 #define WINED3D_CS_QUEUE_MASK (WINED3D_CS_QUEUE_SIZE - 1) C_ASSERT(!(WINED3D_CS_QUEUE_SIZE & (WINED3D_CS_QUEUE_SIZE - 1))); @@ -3758,6 +3760,16 @@ static inline void wined3d_resource_reference(struct wined3d_resource *resource) resource->access_time = cs->queue[WINED3D_CS_QUEUE_DEFAULT].head; } +#define WINED3D_PAUSE_SPIN_COUNT 200u + +static inline void wined3d_pause(unsigned int *spin_count) +{ + static const LARGE_INTEGER timeout = {.QuadPart = WINED3D_CS_CLIENT_WAIT_TIMEOUT * -10}; + + if (++*spin_count >= WINED3D_PAUSE_SPIN_COUNT) + NtDelayExecution(FALSE, &timeout); +} + static inline BOOL wined3d_ge_wrap(ULONG x, ULONG y) { return (x - y) < UINT_MAX / 2; @@ -3768,6 +3780,7 @@ static inline void wined3d_resource_wait_idle(const struct wined3d_resource *res { const struct wined3d_cs *cs = resource->device->cs; ULONG access_time, tail, head; + unsigned int spin_count = 0; if (!cs->thread || cs->thread_id == GetCurrentThreadId()) return; @@ -3806,7 +3819,7 @@ static inline void wined3d_resource_wait_idle(const struct wined3d_resource *res if (!wined3d_ge_wrap(access_time, tail) && access_time != tail) break; - YieldProcessor(); + wined3d_pause(&spin_count); } }

1 0

Matteo Bruni : wined3d: Increase WINED3D_CS_QUERY_POLL_INTERVAL to 100.
by Alexandre Julliard 08 Dec '23

08 Dec '23

Module: wine Branch: master Commit: 3fc716c90707d1daee1974b8754275b2af330ff0 URL: https://gitlab.winehq.org/wine/wine/-/commit/3fc716c90707d1daee1974b8754275… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jul 8 15:54:23 2019 +0200 wined3d: Increase WINED3D_CS_QUERY_POLL_INTERVAL to 100. --- dlls/wined3d/wined3d_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 64b933b2b45..26474cecb07 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3557,7 +3557,7 @@ enum wined3d_cs_queue_id WINED3D_CS_QUEUE_COUNT, }; -#define WINED3D_CS_QUERY_POLL_INTERVAL 10u +#define WINED3D_CS_QUERY_POLL_INTERVAL 100u #if defined(_WIN64) #define WINED3D_CS_QUEUE_SIZE 0x1000000u #else

1 0

Matteo Bruni : wined3d: Add a frametime debug channel.
by Alexandre Julliard 08 Dec '23

08 Dec '23

Module: wine Branch: master Commit: 295c577f1e3c842790862dee992a76b5451b5688 URL: https://gitlab.winehq.org/wine/wine/-/commit/295c577f1e3c842790862dee992a76… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Sep 21 10:23:04 2022 +0200 wined3d: Add a frametime debug channel. --- dlls/wined3d/cs.c | 18 ++++++++++++++++++ dlls/wined3d/wined3d_private.h | 4 +++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index b704b720cd0..4d34a939ac7 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -23,6 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(d3d_perf); WINE_DECLARE_DEBUG_CHANNEL(d3d_sync); WINE_DECLARE_DEBUG_CHANNEL(fps); +WINE_DECLARE_DEBUG_CHANNEL(frametime); static NTSTATUS (WINAPI *pNtAlertThreadByThreadId)(HANDLE tid); static NTSTATUS (WINAPI *pNtWaitForAlertByThreadId)(void *addr, const LARGE_INTEGER *timeout); @@ -643,11 +644,18 @@ static void wined3d_cs_exec_nop(struct wined3d_cs *cs, const void *data) static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { + static LARGE_INTEGER freq; + struct wined3d_texture *logo_texture, *cursor_texture, *back_buffer; struct wined3d_rendertarget_view *dsv = cs->state.fb.depth_stencil; const struct wined3d_cs_present *op = data; const struct wined3d_swapchain_desc *desc; struct wined3d_swapchain *swapchain; + LONGLONG elapsed_time; + LARGE_INTEGER time; + + if (!freq.QuadPart) + QueryPerformanceFrequency(&freq); swapchain = op->swapchain; desc = &swapchain->state.desc; @@ -703,6 +711,16 @@ static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) wined3d_rendertarget_view_validate_location(dsv, WINED3D_LOCATION_DISCARDED); } + if (TRACE_ON(frametime)) + { + QueryPerformanceCounter(&time); + if (swapchain->last_present_time.QuadPart) + { + elapsed_time = time.QuadPart - swapchain->last_present_time.QuadPart; + TRACE_(frametime)("Frame duration %u μs.\n", (unsigned int)(elapsed_time * 1000000 / freq.QuadPart)); + } + swapchain->last_present_time = time; + } if (TRACE_ON(fps)) { DWORD time = GetTickCount(); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 26474cecb07..c17e29cddf2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4029,7 +4029,9 @@ struct wined3d_swapchain unsigned int swap_interval; unsigned int max_frame_latency; - LONG prev_time, frames; /* Performance tracking */ + /* Performance tracking */ + LARGE_INTEGER last_present_time; + LONG prev_time, frames; struct wined3d_swapchain_state state; HWND win_handle;

1 0