=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: d3d11: Validate "ViewDimension" field in D3D11_SHADER_RESOURCE_VIEW_DESC.
Alexandre Julliard
julliard at winehq.org
Thu Jun 16 10:20:56 CDT 2016
Module: wine
Branch: master
Commit: 8f366a5673ec8acb726353c3c2cc1384f0244188
URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f366a5673ec8acb726353c3c2cc1384f0244188
Author: Józef Kucia <jkucia at codeweavers.com>
Date: Thu Jun 16 11:59:33 2016 +0200
d3d11: Validate "ViewDimension" field in D3D11_SHADER_RESOURCE_VIEW_DESC.
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/d3d11/view.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 file changed, 52 insertions(+), 7 deletions(-)
diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c
index c0b17dc..905996d 100644
--- a/dlls/d3d11/view.c
+++ b/dlls/d3d11/view.c
@@ -486,7 +486,7 @@ static HRESULT set_srdesc_from_resource(D3D11_SHADER_RESOURCE_VIEW_DESC *desc, I
}
}
-static void normalize_srv_desc(D3D11_SHADER_RESOURCE_VIEW_DESC *desc, ID3D11Resource *resource)
+static HRESULT normalize_srv_desc(D3D11_SHADER_RESOURCE_VIEW_DESC *desc, ID3D11Resource *resource)
{
unsigned int miplevel_count, layer_count;
D3D11_RESOURCE_DIMENSION dimension;
@@ -495,14 +495,49 @@ static void normalize_srv_desc(D3D11_SHADER_RESOURCE_VIEW_DESC *desc, ID3D11Reso
ID3D11Resource_GetType(resource, &dimension);
switch (dimension)
{
+ case D3D11_RESOURCE_DIMENSION_BUFFER:
+ {
+ if (desc->ViewDimension != D3D11_SRV_DIMENSION_BUFFER
+ && desc->ViewDimension != D3D11_SRV_DIMENSION_BUFFEREX)
+ {
+ WARN("Incompatible dimensions %#x, %#x.\n", dimension, desc->ViewDimension);
+ return E_INVALIDARG;
+ }
+ return S_OK;
+ }
+
+ case D3D11_RESOURCE_DIMENSION_TEXTURE1D:
+ {
+ if (desc->ViewDimension != D3D11_SRV_DIMENSION_TEXTURE1D
+ && desc->ViewDimension != D3D11_SRV_DIMENSION_TEXTURE1DARRAY)
+ {
+ WARN("Incompatible dimensions %#x, %#x.\n", dimension, desc->ViewDimension);
+ return E_INVALIDARG;
+ }
+
+ FIXME("Unhandled 1D texture resource.\n");
+ return S_OK;
+ }
+
case D3D11_RESOURCE_DIMENSION_TEXTURE2D:
{
const struct d3d_texture2d *texture;
+ if (desc->ViewDimension != D3D11_SRV_DIMENSION_TEXTURE2D
+ && desc->ViewDimension != D3D11_SRV_DIMENSION_TEXTURE2DARRAY
+ && desc->ViewDimension != D3D11_SRV_DIMENSION_TEXTURE2DMS
+ && desc->ViewDimension != D3D11_SRV_DIMENSION_TEXTURE2DMSARRAY
+ && desc->ViewDimension != D3D11_SRV_DIMENSION_TEXTURECUBE
+ && desc->ViewDimension != D3D11_SRV_DIMENSION_TEXTURECUBEARRAY)
+ {
+ WARN("Incompatible dimensions %#x, %#x.\n", dimension, desc->ViewDimension);
+ return E_INVALIDARG;
+ }
+
if (!(texture = unsafe_impl_from_ID3D11Texture2D((ID3D11Texture2D *)resource)))
{
ERR("Cannot get implementation from ID3D11Texture2D.\n");
- return;
+ return E_FAIL;
}
format = texture->desc.Format;
@@ -515,10 +550,16 @@ static void normalize_srv_desc(D3D11_SHADER_RESOURCE_VIEW_DESC *desc, ID3D11Reso
{
const struct d3d_texture3d *texture;
+ if (desc->ViewDimension != D3D11_SRV_DIMENSION_TEXTURE3D)
+ {
+ WARN("Incompatible dimensions %#x, %#x.\n", dimension, desc->ViewDimension);
+ return E_INVALIDARG;
+ }
+
if (!(texture = unsafe_impl_from_ID3D11Texture3D((ID3D11Texture3D *)resource)))
{
ERR("Cannot get implementation from ID3D11Texture3D.\n");
- return;
+ return E_FAIL;
}
format = texture->desc.Format;
@@ -528,7 +569,8 @@ static void normalize_srv_desc(D3D11_SHADER_RESOURCE_VIEW_DESC *desc, ID3D11Reso
}
default:
- return;
+ ERR("Unhandled resource dimension %#x.\n", dimension);
+ return E_FAIL;
}
if (desc->Format == DXGI_FORMAT_UNKNOWN)
@@ -585,6 +627,8 @@ static void normalize_srv_desc(D3D11_SHADER_RESOURCE_VIEW_DESC *desc, ID3D11Reso
default:
break;
}
+
+ return S_OK;
}
/* ID3D11DepthStencilView methods */
@@ -1818,14 +1862,15 @@ static HRESULT d3d_shader_resource_view_init(struct d3d_shader_resource_view *vi
if (!desc)
{
- if (FAILED(hr = set_srdesc_from_resource(&view->desc, resource)))
- return hr;
+ hr = set_srdesc_from_resource(&view->desc, resource);
}
else
{
view->desc = *desc;
- normalize_srv_desc(&view->desc, resource);
+ hr = normalize_srv_desc(&view->desc, resource);
}
+ if (FAILED(hr))
+ return hr;
if (FAILED(hr = wined3d_shader_resource_view_desc_from_d3d11(&wined3d_desc, &view->desc)))
return hr;
More information about the wine-cvs
mailing list