=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: dxgi: Set BufferUsage in dxgi_swapchain_GetDesc().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 6141647a52a32c5efb0322d388e12944068ecf63
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=6141647a52a32c5efb0322d388e12944068ecf63

Author: Józef Kucia <jkucia at codeweavers.com>
Date:   Mon Jan 22 14:11:52 2018 +0100

dxgi: Set BufferUsage in dxgi_swapchain_GetDesc().

Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 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 47c7c86..2b18110 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 dca2515..19e428c 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 eca68c3..ec9b2b4 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;