=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: d3d11: Fix default view descriptions for 2D array textures.

[Alexandre Julliard]

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

Author: Józef Kucia <jkucia at codeweavers.com>
Date:   Fri May 13 13:55:31 2016 +0200

d3d11: Fix default view descriptions for 2D array textures.

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/d3d10core/tests/device.c |  4 ++--
 dlls/d3d11/tests/d3d11.c      |  4 ++--
 dlls/d3d11/view.c             | 12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c
index 7c66fe2..133d64b 100644
--- a/dlls/d3d10core/tests/device.c
+++ b/dlls/d3d10core/tests/device.c
@@ -1307,7 +1307,7 @@ static void test_create_depthstencil_view(void)
             U(dsv_desc).Texture2DArray.MipSlice);
     ok(!U(dsv_desc).Texture2DArray.FirstArraySlice, "Got unexpected first array slice %u.\n",
             U(dsv_desc).Texture2DArray.FirstArraySlice);
-    todo_wine ok(U(dsv_desc).Texture2DArray.ArraySize == texture_desc.ArraySize,
+    ok(U(dsv_desc).Texture2DArray.ArraySize == texture_desc.ArraySize,
             "Got unexpected array size %u.\n", U(dsv_desc).Texture2DArray.ArraySize);
 
     ID3D10DepthStencilView_Release(dsview);
@@ -1518,7 +1518,7 @@ static void test_create_rendertarget_view(void)
             U(rtv_desc).Texture2DArray.MipSlice);
     ok(!U(rtv_desc).Texture2DArray.FirstArraySlice, "Got unexpected first array slice %u.\n",
             U(rtv_desc).Texture2DArray.FirstArraySlice);
-    todo_wine ok(U(rtv_desc).Texture2DArray.ArraySize == texture_desc.ArraySize, "Got unexpected array size %u.\n",
+    ok(U(rtv_desc).Texture2DArray.ArraySize == texture_desc.ArraySize, "Got unexpected array size %u.\n",
             U(rtv_desc).Texture2DArray.ArraySize);
 
     ID3D10RenderTargetView_Release(rtview);
diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c
index 03b6113..86f1d24 100644
--- a/dlls/d3d11/tests/d3d11.c
+++ b/dlls/d3d11/tests/d3d11.c
@@ -1835,7 +1835,7 @@ static void test_create_depthstencil_view(void)
             U(dsv_desc).Texture2DArray.MipSlice);
     ok(!U(dsv_desc).Texture2DArray.FirstArraySlice, "Got unexpected first array slice %u.\n",
             U(dsv_desc).Texture2DArray.FirstArraySlice);
-    todo_wine ok(U(dsv_desc).Texture2DArray.ArraySize == texture_desc.ArraySize,
+    ok(U(dsv_desc).Texture2DArray.ArraySize == texture_desc.ArraySize,
             "Got unexpected array size %u.\n", U(dsv_desc).Texture2DArray.ArraySize);
 
     ID3D11DepthStencilView_Release(dsview);
@@ -2047,7 +2047,7 @@ static void test_create_rendertarget_view(void)
             U(rtv_desc).Texture2DArray.MipSlice);
     ok(!U(rtv_desc).Texture2DArray.FirstArraySlice, "Got unexpected first array slice %u.\n",
             U(rtv_desc).Texture2DArray.FirstArraySlice);
-    todo_wine ok(U(rtv_desc).Texture2DArray.ArraySize == texture_desc.ArraySize, "Got unexpected array size %u.\n",
+    ok(U(rtv_desc).Texture2DArray.ArraySize == texture_desc.ArraySize, "Got unexpected array size %u.\n",
             U(rtv_desc).Texture2DArray.ArraySize);
 
     ID3D11RenderTargetView_Release(rtview);
diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c
index c4487d3..5d37d03 100644
--- a/dlls/d3d11/view.c
+++ b/dlls/d3d11/view.c
@@ -60,7 +60,7 @@ static HRESULT set_dsdesc_from_resource(D3D11_DEPTH_STENCIL_VIEW_DESC *desc, ID3
                 desc->ViewDimension = D3D11_DSV_DIMENSION_TEXTURE1DARRAY;
                 desc->u.Texture1DArray.MipSlice = 0;
                 desc->u.Texture1DArray.FirstArraySlice = 0;
-                desc->u.Texture1DArray.ArraySize = 1;
+                desc->u.Texture1DArray.ArraySize = texture_desc.ArraySize;
             }
 
             return S_OK;
@@ -100,13 +100,13 @@ static HRESULT set_dsdesc_from_resource(D3D11_DEPTH_STENCIL_VIEW_DESC *desc, ID3
                     desc->ViewDimension = D3D11_DSV_DIMENSION_TEXTURE2DARRAY;
                     desc->u.Texture2DArray.MipSlice = 0;
                     desc->u.Texture2DArray.FirstArraySlice = 0;
-                    desc->u.Texture2DArray.ArraySize = 1;
+                    desc->u.Texture2DArray.ArraySize = texture_desc.ArraySize;
                 }
                 else
                 {
                     desc->ViewDimension = D3D11_DSV_DIMENSION_TEXTURE2DMSARRAY;
                     desc->u.Texture2DMSArray.FirstArraySlice = 0;
-                    desc->u.Texture2DMSArray.ArraySize = 1;
+                    desc->u.Texture2DMSArray.ArraySize = texture_desc.ArraySize;
                 }
             }
 
@@ -156,7 +156,7 @@ static HRESULT set_rtdesc_from_resource(D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3
                 desc->ViewDimension = D3D11_RTV_DIMENSION_TEXTURE1DARRAY;
                 desc->u.Texture1DArray.MipSlice = 0;
                 desc->u.Texture1DArray.FirstArraySlice = 0;
-                desc->u.Texture1DArray.ArraySize = 1;
+                desc->u.Texture1DArray.ArraySize = texture_desc.ArraySize;
             }
 
             return S_OK;
@@ -197,13 +197,13 @@ static HRESULT set_rtdesc_from_resource(D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3
                     desc->ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2DARRAY;
                     desc->u.Texture2DArray.MipSlice = 0;
                     desc->u.Texture2DArray.FirstArraySlice = 0;
-                    desc->u.Texture2DArray.ArraySize = 1;
+                    desc->u.Texture2DArray.ArraySize = texture_desc.ArraySize;
                 }
                 else
                 {
                     desc->ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2DMSARRAY;
                     desc->u.Texture2DMSArray.FirstArraySlice = 0;
-                    desc->u.Texture2DMSArray.ArraySize = 1;
+                    desc->u.Texture2DMSArray.ArraySize = texture_desc.ArraySize;
                 }
             }