Commit 5569db9a authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard

d3d9: Get rid of IDirect3DTexture9Impl.

parent dd8ed6f8
......@@ -303,6 +303,14 @@ typedef struct IDirect3DBaseTexture9Impl
struct wined3d_texture *wined3d_texture;
} IDirect3DBaseTexture9Impl;
struct d3d9_texture
{
IDirect3DTexture9 IDirect3DTexture9_iface;
LONG refcount;
struct wined3d_texture *wined3d_texture;
IDirect3DDevice9Ex *parent_device;
};
/* --------------------- */
/* IDirect3DCubeTexture9 */
/* --------------------- */
......@@ -320,23 +328,7 @@ typedef struct IDirect3DCubeTexture9Impl
HRESULT cubetexture_init(IDirect3DCubeTexture9Impl *texture, IDirect3DDevice9Impl *device,
UINT edge_length, UINT levels, DWORD usage, D3DFORMAT format, D3DPOOL pool) DECLSPEC_HIDDEN;
/* ----------------- */
/* IDirect3DTexture9 */
/* ----------------- */
/*****************************************************************************
* IDirect3DTexture9 implementation structure
*/
typedef struct IDirect3DTexture9Impl
{
IDirect3DTexture9 IDirect3DTexture9_iface;
LONG ref;
struct wined3d_texture *wined3d_texture;
IDirect3DDevice9Ex *parentDevice;
} IDirect3DTexture9Impl;
HRESULT texture_init(IDirect3DTexture9Impl *texture, IDirect3DDevice9Impl *device,
HRESULT texture_init(struct d3d9_texture *texture, IDirect3DDevice9Impl *device,
UINT width, UINT height, UINT levels, DWORD usage, D3DFORMAT format, D3DPOOL pool) DECLSPEC_HIDDEN;
/* ----------------------- */
......
......@@ -676,7 +676,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_CreateTexture(IDirect3DDevice9Ex *ifa
D3DPOOL pool, IDirect3DTexture9 **texture, HANDLE *shared_handle)
{
IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface);
IDirect3DTexture9Impl *object;
struct d3d9_texture *object;
BOOL set_mem = FALSE;
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