Skip to content

W
wine-winehq
Commit 7bb17f49 authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard
Browse files
Options

d3d8: Get rid of IDirect3DTexture8Impl.

parent e0390da6
Expand all Show whitespace changes
Inline Side-by-side
Showing with 10 additions and 18 deletions
dlls/d3d8/d3d8_private.h
View file @ 7bb17f49
...@@ -104,7 +104,6 @@ typedef struct IDirect3DBaseTexture8Impl IDirect3DBaseTexture8Impl; ...@@ -104,7 +104,6 @@ typedef struct IDirect3DBaseTexture8Impl IDirect3DBaseTexture8Impl;
typedef struct IDirect3DVolumeTexture8Impl IDirect3DVolumeTexture8Impl; typedef struct IDirect3DVolumeTexture8Impl IDirect3DVolumeTexture8Impl;
typedef struct IDirect3D8Impl IDirect3D8Impl; typedef struct IDirect3D8Impl IDirect3D8Impl;
typedef struct IDirect3DDevice8Impl IDirect3DDevice8Impl; typedef struct IDirect3DDevice8Impl IDirect3DDevice8Impl;
typedef struct IDirect3DTexture8Impl IDirect3DTexture8Impl;
typedef struct IDirect3DCubeTexture8Impl IDirect3DCubeTexture8Impl; typedef struct IDirect3DCubeTexture8Impl IDirect3DCubeTexture8Impl;
typedef struct IDirect3DIndexBuffer8Impl IDirect3DIndexBuffer8Impl; typedef struct IDirect3DIndexBuffer8Impl IDirect3DIndexBuffer8Impl;
typedef struct IDirect3DSurface8Impl IDirect3DSurface8Impl; typedef struct IDirect3DSurface8Impl IDirect3DSurface8Impl;
...@@ -311,6 +310,14 @@ struct IDirect3DBaseTexture8Impl ...@@ -311,6 +310,14 @@ struct IDirect3DBaseTexture8Impl
struct wined3d_texture *wined3d_texture; struct wined3d_texture *wined3d_texture;
}; };
struct d3d8_texture
{
IDirect3DTexture8 IDirect3DTexture8_iface;
LONG refcount;
struct wined3d_texture *wined3d_texture;
IDirect3DDevice8 *parent_device;
};
/* --------------------- */ /* --------------------- */
/* IDirect3DCubeTexture8 */ /* IDirect3DCubeTexture8 */
/* --------------------- */ /* --------------------- */
...@@ -329,22 +336,7 @@ struct IDirect3DCubeTexture8Impl ...@@ -329,22 +336,7 @@ struct IDirect3DCubeTexture8Impl
HRESULT cubetexture_init(IDirect3DCubeTexture8Impl *texture, IDirect3DDevice8Impl *device, HRESULT cubetexture_init(IDirect3DCubeTexture8Impl *texture, IDirect3DDevice8Impl *device,
UINT edge_length, UINT levels, DWORD usage, D3DFORMAT format, D3DPOOL pool) DECLSPEC_HIDDEN; UINT edge_length, UINT levels, DWORD usage, D3DFORMAT format, D3DPOOL pool) DECLSPEC_HIDDEN;
/* ----------------- */ HRESULT texture_init(struct d3d8_texture *texture, IDirect3DDevice8Impl *device,
/* IDirect3DTexture8 */
/* ----------------- */
/*****************************************************************************
* IDirect3DTexture8 implementation structure
*/
struct IDirect3DTexture8Impl
{
IDirect3DTexture8 IDirect3DTexture8_iface;
LONG ref;
struct wined3d_texture *wined3d_texture;
IDirect3DDevice8 *parentDevice;
};
HRESULT texture_init(IDirect3DTexture8Impl *texture, IDirect3DDevice8Impl *device,
UINT width, UINT height, UINT levels, DWORD usage, D3DFORMAT format, D3DPOOL pool) DECLSPEC_HIDDEN; UINT width, UINT height, UINT levels, DWORD usage, D3DFORMAT format, D3DPOOL pool) DECLSPEC_HIDDEN;
/* ----------------------- */ /* ----------------------- */
......
dlls/d3d8/device.c
View file @ 7bb17f49
...@@ -685,7 +685,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateTexture(IDirect3DDevice8 *iface ...@@ -685,7 +685,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateTexture(IDirect3DDevice8 *iface
D3DPOOL pool, IDirect3DTexture8 **texture) D3DPOOL pool, IDirect3DTexture8 **texture)
{ {
IDirect3DDevice8Impl *This = impl_from_IDirect3DDevice8(iface); IDirect3DDevice8Impl *This = impl_from_IDirect3DDevice8(iface);
IDirect3DTexture8Impl *object; struct d3d8_texture *object;
HRESULT hr; HRESULT hr;
TRACE("iface %p, width %u, height %u, levels %u, usage %#x, format %#x, pool %#x, texture %p.\n", TRACE("iface %p, width %u, height %u, levels %u, usage %#x, format %#x, pool %#x, texture %p.\n",
......
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