Commit 4a6d3c7e authored by Józef Kucia's avatar Józef Kucia Committed by Alexandre Julliard

d3d11: Handle 3D textures in wined3d_resource_from_d3d10_resource().

parent f0e74961
...@@ -152,6 +152,7 @@ struct d3d_texture3d ...@@ -152,6 +152,7 @@ struct d3d_texture3d
HRESULT d3d_texture3d_create(struct d3d_device *device, const D3D11_TEXTURE3D_DESC *desc, HRESULT d3d_texture3d_create(struct d3d_device *device, const D3D11_TEXTURE3D_DESC *desc,
const D3D11_SUBRESOURCE_DATA *data, struct d3d_texture3d **texture) DECLSPEC_HIDDEN; 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_ID3D11Texture3D(ID3D11Texture3D *iface) DECLSPEC_HIDDEN;
struct d3d_texture3d *unsafe_impl_from_ID3D10Texture3D(ID3D10Texture3D *iface) DECLSPEC_HIDDEN;
/* ID3D11Buffer, ID3D10Buffer */ /* ID3D11Buffer, ID3D10Buffer */
struct d3d_buffer struct d3d_buffer
......
...@@ -924,6 +924,14 @@ static const struct ID3D10Texture3DVtbl d3d10_texture3d_vtbl = ...@@ -924,6 +924,14 @@ static const struct ID3D10Texture3DVtbl d3d10_texture3d_vtbl =
d3d10_texture3d_GetDesc, 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) struct d3d_texture3d *unsafe_impl_from_ID3D11Texture3D(ID3D11Texture3D *iface)
{ {
if (!iface) if (!iface)
......
...@@ -637,6 +637,10 @@ struct wined3d_resource *wined3d_resource_from_d3d10_resource(ID3D10Resource *re ...@@ -637,6 +637,10 @@ struct wined3d_resource *wined3d_resource_from_d3d10_resource(ID3D10Resource *re
return wined3d_texture_get_resource(unsafe_impl_from_ID3D10Texture2D( return wined3d_texture_get_resource(unsafe_impl_from_ID3D10Texture2D(
(ID3D10Texture2D *)resource)->wined3d_texture); (ID3D10Texture2D *)resource)->wined3d_texture);
case D3D10_RESOURCE_DIMENSION_TEXTURE3D:
return wined3d_texture_get_resource(unsafe_impl_from_ID3D10Texture3D(
(ID3D10Texture3D *)resource)->wined3d_texture);
default: default:
FIXME("Unhandled resource dimension %#x.\n", dimension); FIXME("Unhandled resource dimension %#x.\n", dimension);
return NULL; return NULL;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment