ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3d11: Normalize "ArraySize" field in D3D11_RENDER_TARGET_VIEW_DESC. 

Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Józef Kucia 2016-06-08 14:54:57 +02:00 committed by Alexandre Julliard
parent cc9b4d8a9e
commit 723f73aeb6
1 changed files with 54 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
dlls/d3d11/view.c
View File

@ -282,7 +282,7 @@ static HRESULT set_rtdesc_from_resource(D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3
desc->ViewDimension = D3D11_RTV_DIMENSION_TEXTURE3D;
desc->u.Texture3D.MipSlice = 0;
desc->u.Texture3D.FirstWSlice = 0;
desc->u.Texture3D.WSize = 1;
desc->u.Texture3D.WSize = texture_desc.Depth;
return S_OK;
}
@ -296,51 +296,72 @@ static HRESULT set_rtdesc_from_resource(D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3
static void normalize_rtv_desc(D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3D11Resource *resource)
{
D3D11_RESOURCE_DIMENSION dimension;
if (desc->Format != DXGI_FORMAT_UNKNOWN)
return;
unsigned int layer_count;
DXGI_FORMAT format;
ID3D11Resource_GetType(resource, &dimension);
switch (dimension)
{
case D3D11_RESOURCE_DIMENSION_TEXTURE1D:
{
D3D11_TEXTURE1D_DESC texture_desc;
ID3D11Texture1D *texture;
if (FAILED(ID3D11Resource_QueryInterface(resource, &IID_ID3D11Texture1D, (void **)&texture)))
{
ERR("Resource of type TEXTURE1D doesn't implement ID3D11Texture1D.\n");
break;
}
ID3D11Texture1D_GetDesc(texture, &texture_desc);
ID3D11Texture1D_Release(texture);
if (desc->Format == DXGI_FORMAT_UNKNOWN)
desc->Format = texture_desc.Format;
break;
}
case D3D11_RESOURCE_DIMENSION_TEXTURE2D:
{
D3D11_TEXTURE2D_DESC texture_desc;
ID3D11Texture2D *texture;
const struct d3d_texture2d *texture;
if (FAILED(ID3D11Resource_QueryInterface(resource, &IID_ID3D11Texture2D, (void **)&texture)))
if (!(texture = unsafe_impl_from_ID3D11Texture2D((ID3D11Texture2D *)resource)))
{
ERR("Resource of type TEXTURE2D doesn't implement ID3D11Texture2D.\n");
break;
ERR("Cannot get implementation from ID3D11Texture2D.\n");
return;
}
ID3D11Texture2D_GetDesc(texture, &texture_desc);
ID3D11Texture2D_Release(texture);
if (desc->Format == DXGI_FORMAT_UNKNOWN)
desc->Format = texture_desc.Format;
format = texture->desc.Format;
layer_count = texture->desc.ArraySize;
break;
}
case D3D11_RESOURCE_DIMENSION_TEXTURE3D:
{
const struct d3d_texture3d *texture;
if (!(texture = unsafe_impl_from_ID3D11Texture3D((ID3D11Texture3D *)resource)))
{
ERR("Cannot get implementation from ID3D11Texture3D.\n");
return;
}
format = texture->desc.Format;
layer_count = texture->desc.Depth;
break;
}
default:
return;
}
if (desc->Format == DXGI_FORMAT_UNKNOWN)
desc->Format = format;
switch (desc->ViewDimension)
{
case D3D11_RTV_DIMENSION_TEXTURE1DARRAY:
if (desc->u.Texture1DArray.ArraySize == -1 && desc->u.Texture1DArray.FirstArraySlice < layer_count)
desc->u.Texture1DArray.ArraySize = layer_count - desc->u.Texture1DArray.ArraySize;
break;
case D3D11_RTV_DIMENSION_TEXTURE2DARRAY:
if (desc->u.Texture2DArray.ArraySize == -1 && desc->u.Texture2DArray.FirstArraySlice < layer_count)
desc->u.Texture2DArray.ArraySize = layer_count - desc->u.Texture2DArray.FirstArraySlice;
break;
case D3D11_RTV_DIMENSION_TEXTURE2DMSARRAY:
if (desc->u.Texture2DMSArray.ArraySize == -1 && desc->u.Texture2DMSArray.FirstArraySlice < layer_count)
desc->u.Texture2DMSArray.ArraySize = layer_count - desc->u.Texture2DMSArray.FirstArraySlice;
break;
case D3D11_RTV_DIMENSION_TEXTURE3D:
layer_count = max(1, layer_count >> desc->u.Texture3D.MipSlice);
if (desc->u.Texture3D.WSize == -1 && desc->u.Texture3D.FirstWSlice < layer_count)
desc->u.Texture3D.WSize = layer_count - desc->u.Texture3D.FirstWSlice;
break;
default:
break;
}