summaryrefslogtreecommitdiff
path: root/src/gallium/winsys/d3d12
diff options
context:
space:
mode:
authorJesse Natalie <jenatali@microsoft.com>2020-12-08 12:14:40 -0800
committerMarge Bot <eric+marge@anholt.net>2020-12-16 16:25:54 +0000
commit50fab5da93ad05817f8bc33abba759cc0cb3d0ef (patch)
tree79fd547c4ba5044407d3f2d8def030cbedbabf58 /src/gallium/winsys/d3d12
parentbc5f69faee969cf32fdb7cd31b8b12206d82a77e (diff)
d3d12: Refactor screen to abstract DXGI details
The next commit will add an alternative that can be dropped in instead. Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7937>
Diffstat (limited to 'src/gallium/winsys/d3d12')
-rw-r--r--src/gallium/winsys/d3d12/wgl/d3d12_wgl_framebuffer.cpp4
-rw-r--r--src/gallium/winsys/d3d12/wgl/d3d12_wgl_winsys.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/winsys/d3d12/wgl/d3d12_wgl_framebuffer.cpp b/src/gallium/winsys/d3d12/wgl/d3d12_wgl_framebuffer.cpp
index 9ac8b80b2e6..9409beb9ee6 100644
--- a/src/gallium/winsys/d3d12/wgl/d3d12_wgl_framebuffer.cpp
+++ b/src/gallium/winsys/d3d12/wgl/d3d12_wgl_framebuffer.cpp
@@ -71,7 +71,7 @@ d3d12_wgl_framebuffer_resize(stw_winsys_framebuffer *fb,
pipe_resource *templ)
{
struct d3d12_wgl_framebuffer *framebuffer = d3d12_wgl_framebuffer(fb);
- struct d3d12_screen *screen = framebuffer->screen;
+ struct d3d12_dxgi_screen *screen = d3d12_dxgi_screen(framebuffer->screen);
DXGI_SWAP_CHAIN_DESC1 desc = {};
desc.BufferCount = 2;
@@ -88,7 +88,7 @@ d3d12_wgl_framebuffer_resize(stw_winsys_framebuffer *fb,
if (!framebuffer->swapchain) {
ComPtr<IDXGISwapChain1> swapchain1;
if (FAILED(screen->factory->CreateSwapChainForHwnd(
- screen->cmdqueue,
+ screen->base.cmdqueue,
framebuffer->window,
&desc,
nullptr,
diff --git a/src/gallium/winsys/d3d12/wgl/d3d12_wgl_winsys.c b/src/gallium/winsys/d3d12/wgl/d3d12_wgl_winsys.c
index 7a193cdef68..65a7be01bbb 100644
--- a/src/gallium/winsys/d3d12/wgl/d3d12_wgl_winsys.c
+++ b/src/gallium/winsys/d3d12/wgl/d3d12_wgl_winsys.c
@@ -38,7 +38,7 @@ d3d12_wgl_create_screen(struct sw_winsys *winsys, HDC hDC)
stw_dev->callbacks.pfnGetAdapterLuid(hDC, &local_luid);
adapter_luid = &local_luid;
}
- return d3d12_create_screen(winsys, adapter_luid);
+ return d3d12_create_dxgi_screen(winsys, adapter_luid);
}
void