d3d11: Fix calculation of array size for 1D textures. (v2)

Sebastian Lackner sebastian at fds-team.de
Tue Aug 23 15:48:27 CDT 2016


From: Michael Müller <michael at fds-team.de>

Signed-off-by: Michael Müller <michael at fds-team.de>
Signed-off-by: Sebastian Lackner <sebastian at fds-team.de>
---

Oops, there were a couple of similar mistakes. This should fix all of them.

 dlls/d3d11/view.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c
index a13316f..205513d 100644
--- a/dlls/d3d11/view.c
+++ b/dlls/d3d11/view.c
@@ -184,7 +184,7 @@ static HRESULT normalize_dsv_desc(D3D11_DEPTH_STENCIL_VIEW_DESC *desc, ID3D11Res
     {
         case D3D11_DSV_DIMENSION_TEXTURE1DARRAY:
             if (desc->u.Texture1DArray.ArraySize == ~0u && desc->u.Texture1DArray.FirstArraySlice < layer_count)
-                desc->u.Texture1DArray.ArraySize = layer_count - desc->u.Texture1DArray.ArraySize;
+                desc->u.Texture1DArray.ArraySize = layer_count - desc->u.Texture1DArray.FirstArraySlice;
             break;
 
         case D3D11_DSV_DIMENSION_TEXTURE2DARRAY:
@@ -412,7 +412,7 @@ static HRESULT normalize_rtv_desc(D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3D11Res
     {
         case D3D11_RTV_DIMENSION_TEXTURE1DARRAY:
             if (desc->u.Texture1DArray.ArraySize == ~0u && desc->u.Texture1DArray.FirstArraySlice < layer_count)
-                desc->u.Texture1DArray.ArraySize = layer_count - desc->u.Texture1DArray.ArraySize;
+                desc->u.Texture1DArray.ArraySize = layer_count - desc->u.Texture1DArray.FirstArraySlice;
             break;
 
         case D3D11_RTV_DIMENSION_TEXTURE2DARRAY:
@@ -915,7 +915,7 @@ static HRESULT normalize_uav_desc(D3D11_UNORDERED_ACCESS_VIEW_DESC *desc, ID3D11
     {
         case D3D11_UAV_DIMENSION_TEXTURE1DARRAY:
             if (desc->u.Texture1DArray.ArraySize == ~0u && desc->u.Texture1DArray.FirstArraySlice < layer_count)
-                desc->u.Texture1DArray.ArraySize = layer_count - desc->u.Texture1DArray.ArraySize;
+                desc->u.Texture1DArray.ArraySize = layer_count - desc->u.Texture1DArray.FirstArraySlice;
             break;
 
         case D3D11_UAV_DIMENSION_TEXTURE2DARRAY:
-- 
2.9.0



More information about the wine-patches mailing list