Józef Kucia : d3d10core/tests: Use get_rtv_desc() in test_render_target_views().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: eab40edba5e457459270e14c0f8113d7457bc419
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=eab40edba5e457459270e14c0f...

Author: Józef Kucia <jkucia(a)codeweavers.com>
Date:   Wed Jun 22 11:37:35 2016 +0200

d3d10core/tests: Use get_rtv_desc() in test_render_target_views().

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

---

 dlls/d3d10core/tests/device.c | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c
index eabc659..1f70e22 100644
--- a/dlls/d3d10core/tests/device.c
+++ b/dlls/d3d10core/tests/device.c
@@ -2166,7 +2166,7 @@ static void test_render_target_views(void)
     static struct test
     {
         struct texture texture;
-        struct rtv rtv;
+        struct rtv_desc rtv;
         DWORD expected_colors[4];
     }
     tests[] =
@@ -2238,23 +2238,7 @@ static void test_render_target_views(void)
         hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture);
         ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#x.\n", i, hr);
 
-        rtv_desc.Format = texture_desc.Format;
-        rtv_desc.ViewDimension = test->rtv.dimension;
-        if (test->rtv.dimension == D3D10_RTV_DIMENSION_TEXTURE2D)
-        {
-            U(rtv_desc).Texture2D.MipSlice = test->rtv.miplevel_idx;
-        }
-        else if (test->rtv.dimension == D3D10_RTV_DIMENSION_TEXTURE2DARRAY)
-        {
-            U(rtv_desc).Texture2DArray.MipSlice = test->rtv.miplevel_idx;
-            U(rtv_desc).Texture2DArray.FirstArraySlice = test->rtv.layer_idx;
-            U(rtv_desc).Texture2DArray.ArraySize = test->rtv.layer_count;
-        }
-        else
-        {
-            trace("Test %u: Unhandled view dimension %#x.\n", i, test->rtv.dimension);
-        }
-
+        get_rtv_desc(&rtv_desc, &test->rtv);
         hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)texture, &rtv_desc, &rtv);
         ok(SUCCEEDED(hr), "Test %u: Failed to create render target view, hr %#x.\n", i, hr);