Module: Mesa Branch: main Commit: 501154b4edc06efcf39e99f61373750bee3c0e3e URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=501154b4edc06efcf39e99f61373750bee3c0e3e
Author: Jesse Natalie <[email protected]> Date: Mon Sep 20 09:39:55 2021 -0700 wgl: Allow per-framebuffer swap interval overrides Acked-by: Daniel Stone <[email protected]> Acked-by: Mike Blumenkrantz <[email protected]> Acked-by: Sidney Just <[email protected]> Acked-by: Jason Ekstrand <[email protected]> Tested-by: Yonggang Luo <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12964> --- src/gallium/frontends/wgl/stw_framebuffer.c | 15 ++++++++++----- src/gallium/frontends/wgl/stw_framebuffer.h | 1 + src/gallium/frontends/wgl/stw_winsys.h | 3 ++- src/gallium/winsys/d3d12/wgl/d3d12_wgl_framebuffer.cpp | 6 +++--- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/gallium/frontends/wgl/stw_framebuffer.c b/src/gallium/frontends/wgl/stw_framebuffer.c index 0e4a7a77f81..762164b40d0 100644 --- a/src/gallium/frontends/wgl/stw_framebuffer.c +++ b/src/gallium/frontends/wgl/stw_framebuffer.c @@ -302,6 +302,9 @@ stw_framebuffer_create(HWND hWnd, int iPixelFormat, enum stw_framebuffer_owner o fb->refcnt = 1; + /* A -1 means defer to the global stw_dev->swap_interval */ + fb->swap_interval = -1; + /* * Windows can be sometimes have zero width and or height, but we ensure * a non-zero framebuffer size at all times. @@ -604,7 +607,8 @@ stw_framebuffer_present_locked(HDC hdc, struct pipe_resource *res) { if (fb->winsys_framebuffer) { - BOOL result = fb->winsys_framebuffer->present(fb->winsys_framebuffer); + int interval = fb->swap_interval == -1 ? stw_dev->swap_interval : fb->swap_interval; + BOOL result = fb->winsys_framebuffer->present(fb->winsys_framebuffer, interval); stw_framebuffer_update(fb); stw_notify_current_locked(fb); @@ -653,7 +657,7 @@ stw_framebuffer_present_locked(HDC hdc, * This is for the WGL_ARB_swap_interval extension. */ static void -wait_swap_interval(struct stw_framebuffer *fb) +wait_swap_interval(struct stw_framebuffer *fb, int interval) { /* Note: all time variables here are in units of microseconds */ int64_t cur_time = os_time_get_nano() / 1000; @@ -662,7 +666,7 @@ wait_swap_interval(struct stw_framebuffer *fb) /* Compute time since previous swap */ int64_t delta = cur_time - fb->prev_swap_time; int64_t min_swap_period = - 1.0e6 / stw_dev->refresh_rate * stw_dev->swap_interval; + 1.0e6 / stw_dev->refresh_rate * interval; /* If time since last swap is less than wait period, wait. * Note that it's possible for the delta to be negative because of @@ -704,8 +708,9 @@ stw_framebuffer_swap_locked(HDC hdc, struct stw_framebuffer *fb) } } - if (stw_dev->swap_interval != 0 && !fb->winsys_framebuffer) { - wait_swap_interval(fb); + int interval = fb->swap_interval == -1 ? stw_dev->swap_interval : fb->swap_interval; + if (interval != 0 && !fb->winsys_framebuffer) { + wait_swap_interval(fb, interval); } return stw_st_swap_framebuffer_locked(hdc, ctx->st, fb->stfb); diff --git a/src/gallium/frontends/wgl/stw_framebuffer.h b/src/gallium/frontends/wgl/stw_framebuffer.h index db8a82a6851..0d120f00b5d 100644 --- a/src/gallium/frontends/wgl/stw_framebuffer.h +++ b/src/gallium/frontends/wgl/stw_framebuffer.h @@ -129,6 +129,7 @@ struct stw_framebuffer struct stw_winsys_framebuffer *winsys_framebuffer; /* For WGL_EXT_swap_control */ + int swap_interval; int64_t prev_swap_time; /** diff --git a/src/gallium/frontends/wgl/stw_winsys.h b/src/gallium/frontends/wgl/stw_winsys.h index 66fb30eb8d4..e46137d3cbb 100644 --- a/src/gallium/frontends/wgl/stw_winsys.h +++ b/src/gallium/frontends/wgl/stw_winsys.h @@ -52,7 +52,8 @@ struct stw_winsys_framebuffer struct pipe_context *context); boolean - (*present)(struct stw_winsys_framebuffer *fb); + (*present)(struct stw_winsys_framebuffer *fb, + int interval); void (*resize)(struct stw_winsys_framebuffer *fb, diff --git a/src/gallium/winsys/d3d12/wgl/d3d12_wgl_framebuffer.cpp b/src/gallium/winsys/d3d12/wgl/d3d12_wgl_framebuffer.cpp index 7864da8bd10..65aebdb92d1 100644 --- a/src/gallium/winsys/d3d12/wgl/d3d12_wgl_framebuffer.cpp +++ b/src/gallium/winsys/d3d12/wgl/d3d12_wgl_framebuffer.cpp @@ -150,7 +150,7 @@ d3d12_wgl_framebuffer_resize(stw_winsys_framebuffer *fb, } static boolean -d3d12_wgl_framebuffer_present(stw_winsys_framebuffer *fb) +d3d12_wgl_framebuffer_present(stw_winsys_framebuffer *fb, int interval) { auto framebuffer = d3d12_wgl_framebuffer(fb); if (!framebuffer->swapchain) { @@ -158,10 +158,10 @@ d3d12_wgl_framebuffer_present(stw_winsys_framebuffer *fb) return false; } - if (stw_dev->swap_interval < 1) + if (interval < 1) return S_OK == framebuffer->swapchain->Present(0, DXGI_PRESENT_ALLOW_TEARING); else - return S_OK == framebuffer->swapchain->Present(stw_dev->swap_interval, 0); + return S_OK == framebuffer->swapchain->Present(interval, 0); } static struct pipe_resource *
