[PATCH 2/5] dxgi: Set BufferUsage in dxgi_swapchain_GetDesc().
Józef Kucia
jkucia at codeweavers.com
Mon Jan 22 07:11:52 CST 2018
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
---
dlls/d3d10_1/tests/d3d10_1.c | 2 +-
dlls/d3d11/tests/d3d11.c | 2 +-
dlls/dxgi/swapchain.c | 3 ++-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/dlls/d3d10_1/tests/d3d10_1.c b/dlls/d3d10_1/tests/d3d10_1.c
index 47c7c86380b5..2b18110fa6e9 100644
--- a/dlls/d3d10_1/tests/d3d10_1.c
+++ b/dlls/d3d10_1/tests/d3d10_1.c
@@ -189,7 +189,7 @@ static void test_create_device(void)
"Got unexpected SampleDesc.Count %u.\n", obtained_desc.SampleDesc.Count);
ok(obtained_desc.SampleDesc.Quality == swapchain_desc.SampleDesc.Quality,
"Got unexpected SampleDesc.Quality %u.\n", obtained_desc.SampleDesc.Quality);
- todo_wine ok(obtained_desc.BufferUsage == swapchain_desc.BufferUsage,
+ ok(obtained_desc.BufferUsage == swapchain_desc.BufferUsage,
"Got unexpected BufferUsage %#x.\n", obtained_desc.BufferUsage);
ok(obtained_desc.BufferCount == swapchain_desc.BufferCount,
"Got unexpected BufferCount %u.\n", obtained_desc.BufferCount);
diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c
index dca2515d0ec7..19e428c2f5bc 100644
--- a/dlls/d3d11/tests/d3d11.c
+++ b/dlls/d3d11/tests/d3d11.c
@@ -1548,7 +1548,7 @@ static void test_create_device(void)
"Got unexpected SampleDesc.Count %u.\n", obtained_desc.SampleDesc.Count);
ok(obtained_desc.SampleDesc.Quality == swapchain_desc.SampleDesc.Quality,
"Got unexpected SampleDesc.Quality %u.\n", obtained_desc.SampleDesc.Quality);
- todo_wine ok(obtained_desc.BufferUsage == swapchain_desc.BufferUsage,
+ ok(obtained_desc.BufferUsage == swapchain_desc.BufferUsage,
"Got unexpected BufferUsage %#x.\n", obtained_desc.BufferUsage);
ok(obtained_desc.BufferCount == swapchain_desc.BufferCount,
"Got unexpected BufferCount %u.\n", obtained_desc.BufferCount);
diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c
index eca68c3e5e35..ec9b2b43b6ba 100644
--- a/dlls/dxgi/swapchain.c
+++ b/dlls/dxgi/swapchain.c
@@ -285,7 +285,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetDesc(IDXGISwapChain1 *iface,
wined3d_swapchain_get_desc(swapchain->wined3d_swapchain, &wined3d_desc);
wined3d_mutex_unlock();
- FIXME("Ignoring ScanlineOrdering, Scaling and SwapEffect.\n");
+ FIXME("Ignoring ScanlineOrdering, Scaling, BufferUsage and SwapEffect.\n");
desc->BufferDesc.Width = wined3d_desc.backbuffer_width;
desc->BufferDesc.Height = wined3d_desc.backbuffer_height;
@@ -295,6 +295,7 @@ static HRESULT STDMETHODCALLTYPE dxgi_swapchain_GetDesc(IDXGISwapChain1 *iface,
desc->BufferDesc.ScanlineOrdering = DXGI_MODE_SCANLINE_ORDER_UNSPECIFIED;
desc->BufferDesc.Scaling = DXGI_MODE_SCALING_UNSPECIFIED;
dxgi_sample_desc_from_wined3d(&desc->SampleDesc, wined3d_desc.multisample_type, wined3d_desc.multisample_quality);
+ desc->BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT;
desc->BufferCount = wined3d_desc.backbuffer_count;
desc->OutputWindow = wined3d_desc.device_window;
desc->Windowed = wined3d_desc.windowed;
--
2.13.6
More information about the wine-devel
mailing list