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

d3d11: Rename d3d10_texture2d to d3d_texture2d.

parent f83181fc
......@@ -94,7 +94,7 @@ HRESULT parse_dxbc(const char *data, SIZE_T data_size,
HRESULT (*chunk_handler)(const char *data, DWORD data_size, DWORD tag, void *ctx), void *ctx) DECLSPEC_HIDDEN;
/* ID3D11Texture2D, ID3D10Texture2D */
struct d3d10_texture2d
struct d3d_texture2d
{
ID3D11Texture2D ID3D11Texture2D_iface;
ID3D10Texture2D ID3D10Texture2D_iface;
......@@ -107,14 +107,14 @@ struct d3d10_texture2d
ID3D11Device *device;
};
static inline struct d3d10_texture2d *impl_from_ID3D10Texture2D(ID3D10Texture2D *iface)
static inline struct d3d_texture2d *impl_from_ID3D10Texture2D(ID3D10Texture2D *iface)
{
return CONTAINING_RECORD(iface, struct d3d10_texture2d, ID3D10Texture2D_iface);
return CONTAINING_RECORD(iface, struct d3d_texture2d, ID3D10Texture2D_iface);
}
HRESULT d3d_texture2d_create(struct d3d_device *device, const D3D11_TEXTURE2D_DESC *desc,
const D3D11_SUBRESOURCE_DATA *data, struct d3d10_texture2d **texture) DECLSPEC_HIDDEN;
struct d3d10_texture2d *unsafe_impl_from_ID3D10Texture2D(ID3D10Texture2D *iface) DECLSPEC_HIDDEN;
const D3D11_SUBRESOURCE_DATA *data, struct d3d_texture2d **texture) DECLSPEC_HIDDEN;
struct d3d_texture2d *unsafe_impl_from_ID3D10Texture2D(ID3D10Texture2D *iface) DECLSPEC_HIDDEN;
/* ID3D10Texture3D */
struct d3d10_texture3d
......
......@@ -76,7 +76,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateTexture2D(ID3D11Device *ifac
const D3D11_TEXTURE2D_DESC *desc, const D3D11_SUBRESOURCE_DATA *data, ID3D11Texture2D **texture)
{
struct d3d_device *device = impl_from_ID3D11Device(iface);
struct d3d10_texture2d *object;
struct d3d_texture2d *object;
HRESULT hr;
TRACE("iface %p, desc %p, data %p, texture %p.\n", iface, desc, data, texture);
......@@ -2015,7 +2015,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateTexture2D(ID3D10Device1 *ifa
{
struct d3d_device *device = impl_from_ID3D10Device(iface);
D3D11_TEXTURE2D_DESC d3d11_desc;
struct d3d10_texture2d *object;
struct d3d_texture2d *object;
HRESULT hr;
TRACE("iface %p, desc %p, data %p, texture %p.\n", iface, desc, data, texture);
......@@ -2898,7 +2898,7 @@ static HRESULT CDECL device_parent_create_swapchain_surface(struct wined3d_devic
{
struct d3d_device *device = device_from_wined3d_device_parent(device_parent);
struct wined3d_resource *sub_resource;
struct d3d10_texture2d *texture;
struct d3d_texture2d *texture;
ID3D10Texture2D *texture_iface;
D3D10_TEXTURE2D_DESC desc;
HRESULT hr;
......
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