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

d3d11: Handle 3D textures in wined3d_resource_from_d3d10_resource(). 

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 2018-01-10 17:26:33 +01:00 committed by Alexandre Julliard
parent f0e74961e1
commit 4a6d3c7eac
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/d3d11/d3d11_private.h
View File

@ -152,6 +152,7 @@ struct d3d_texture3d
HRESULT d3d_texture3d_create(struct d3d_device *device, const D3D11_TEXTURE3D_DESC *desc,
const D3D11_SUBRESOURCE_DATA *data, struct d3d_texture3d **texture) DECLSPEC_HIDDEN;
struct d3d_texture3d *unsafe_impl_from_ID3D11Texture3D(ID3D11Texture3D *iface) DECLSPEC_HIDDEN;
struct d3d_texture3d *unsafe_impl_from_ID3D10Texture3D(ID3D10Texture3D *iface) DECLSPEC_HIDDEN;
/* ID3D11Buffer, ID3D10Buffer */
struct d3d_buffer

8
dlls/d3d11/texture.c
View File

@ -924,6 +924,14 @@ static const struct ID3D10Texture3DVtbl d3d10_texture3d_vtbl =
d3d10_texture3d_GetDesc,
};
struct d3d_texture3d *unsafe_impl_from_ID3D10Texture3D(ID3D10Texture3D *iface)
{
if (!iface)
return NULL;
assert(iface->lpVtbl == &d3d10_texture3d_vtbl);
return CONTAINING_RECORD(iface, struct d3d_texture3d, ID3D10Texture3D_iface);
}
struct d3d_texture3d *unsafe_impl_from_ID3D11Texture3D(ID3D11Texture3D *iface)
{
if (!iface)

4
dlls/d3d11/utils.c
View File

@ -637,6 +637,10 @@ struct wined3d_resource *wined3d_resource_from_d3d10_resource(ID3D10Resource *re
return wined3d_texture_get_resource(unsafe_impl_from_ID3D10Texture2D(
(ID3D10Texture2D *)resource)->wined3d_texture);
case D3D10_RESOURCE_DIMENSION_TEXTURE3D:
return wined3d_texture_get_resource(unsafe_impl_from_ID3D10Texture3D(
(ID3D10Texture3D *)resource)->wined3d_texture);
default:
FIXME("Unhandled resource dimension %#x.\n", dimension);
return NULL;