marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3d8: Get rid of IDirect3DVolume8Impl.

oldstable
Henri Verbeet 2012-05-23 18:14:34 +02:00 committed by Alexandre Julliard
parent ec466ff3b7
commit 75d166f62c
4 changed files with 88 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dlls/d3d8/d3d8_private.h
View File

@ -100,8 +100,6 @@
void fixup_caps(WINED3DCAPS *pWineCaps) DECLSPEC_HIDDEN; void fixup_caps(WINED3DCAPS *pWineCaps) DECLSPEC_HIDDEN;
typedef struct IDirect3DVolume8Impl IDirect3DVolume8Impl;
struct d3d8 struct d3d8
{ {
IDirect3D8 IDirect3D8_iface; IDirect3D8 IDirect3D8_iface;
@ -168,23 +166,16 @@ struct d3d8_device
HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wined3d *wined3d, UINT adapter, HRESULT device_init(struct d3d8_device *device, struct d3d8 *parent, struct wined3d *wined3d, UINT adapter,
D3DDEVTYPE device_type, HWND focus_window, DWORD flags, D3DPRESENT_PARAMETERS *parameters) DECLSPEC_HIDDEN; D3DDEVTYPE device_type, HWND focus_window, DWORD flags, D3DPRESENT_PARAMETERS *parameters) DECLSPEC_HIDDEN;
/* ---------------- */ struct d3d8_volume
/* IDirect3DVolume8 */
/* ---------------- */
/*****************************************************************************
* IDirect3DVolume8 implementation structure
*/
struct IDirect3DVolume8Impl
{ {
IDirect3DVolume8 IDirect3DVolume8_iface; IDirect3DVolume8 IDirect3DVolume8_iface;
LONG ref; LONG refcount;
struct wined3d_volume *wined3d_volume; struct wined3d_volume *wined3d_volume;
IUnknown *container; IUnknown *container;
IUnknown *forwardReference; IUnknown *forwardReference;
}; };
HRESULT volume_init(IDirect3DVolume8Impl *volume, struct d3d8_device *device, UINT width, UINT height, HRESULT volume_init(struct d3d8_volume *volume, struct d3d8_device *device, UINT width, UINT height,
UINT depth, DWORD usage, enum wined3d_format_id format, enum wined3d_pool pool) DECLSPEC_HIDDEN; UINT depth, DWORD usage, enum wined3d_format_id format, enum wined3d_pool pool) DECLSPEC_HIDDEN;
struct d3d8_swapchain struct d3d8_swapchain

2
dlls/d3d8/device.c
View File

@ -2902,7 +2902,7 @@ static HRESULT CDECL device_parent_create_volume(struct wined3d_device_parent *d
enum wined3d_pool pool, DWORD usage, struct wined3d_volume **volume) enum wined3d_pool pool, DWORD usage, struct wined3d_volume **volume)
{ {
struct d3d8_device *device = device_from_device_parent(device_parent); struct d3d8_device *device = device_from_device_parent(device_parent);
IDirect3DVolume8Impl *object; struct d3d8_volume *object;
HRESULT hr; HRESULT hr;
TRACE("device_parent %p, container_parent %p, width %u, height %u, depth %u, " TRACE("device_parent %p, container_parent %p, width %u, height %u, depth %u, "

6
dlls/d3d8/texture.c
View File

@ -1031,7 +1031,7 @@ static HRESULT WINAPI d3d8_texture_3d_GetVolumeLevel(IDirect3DVolumeTexture8 *if
{ {
struct d3d8_texture *texture = impl_from_IDirect3DVolumeTexture8(iface); struct d3d8_texture *texture = impl_from_IDirect3DVolumeTexture8(iface);
struct wined3d_resource *sub_resource; struct wined3d_resource *sub_resource;
IDirect3DVolume8Impl *volume_impl; struct d3d8_volume *volume_impl;
TRACE("iface %p, level %u, volume %p.\n", iface, level, volume); TRACE("iface %p, level %u, volume %p.\n", iface, level, volume);
@ -1055,7 +1055,7 @@ static HRESULT WINAPI d3d8_texture_3d_LockBox(IDirect3DVolumeTexture8 *iface,
{ {
struct d3d8_texture *texture = impl_from_IDirect3DVolumeTexture8(iface); struct d3d8_texture *texture = impl_from_IDirect3DVolumeTexture8(iface);
struct wined3d_resource *sub_resource; struct wined3d_resource *sub_resource;
IDirect3DVolume8Impl *volume_impl; struct d3d8_volume *volume_impl;
HRESULT hr; HRESULT hr;
TRACE("iface %p, level %u, locked_box %p, box %p, flags %#x.\n", TRACE("iface %p, level %u, locked_box %p, box %p, flags %#x.\n",
@ -1078,7 +1078,7 @@ static HRESULT WINAPI d3d8_texture_3d_UnlockBox(IDirect3DVolumeTexture8 *iface,
{ {
struct d3d8_texture *texture = impl_from_IDirect3DVolumeTexture8(iface); struct d3d8_texture *texture = impl_from_IDirect3DVolumeTexture8(iface);
struct wined3d_resource *sub_resource; struct wined3d_resource *sub_resource;
IDirect3DVolume8Impl *volume_impl; struct d3d8_volume *volume_impl;
HRESULT hr; HRESULT hr;
TRACE("iface %p, level %u.\n", iface, level); TRACE("iface %p, level %u.\n", iface, level);

156
dlls/d3d8/volume.c
View File

@ -23,50 +23,52 @@
WINE_DEFAULT_DEBUG_CHANNEL(d3d8); WINE_DEFAULT_DEBUG_CHANNEL(d3d8);
static inline IDirect3DVolume8Impl *impl_from_IDirect3DVolume8(IDirect3DVolume8 *iface) static inline struct d3d8_volume *impl_from_IDirect3DVolume8(IDirect3DVolume8 *iface)
{ {
return CONTAINING_RECORD(iface, IDirect3DVolume8Impl, IDirect3DVolume8_iface); return CONTAINING_RECORD(iface, struct d3d8_volume, IDirect3DVolume8_iface);
} }
static HRESULT WINAPI IDirect3DVolume8Impl_QueryInterface(IDirect3DVolume8 *iface, REFIID riid, static HRESULT WINAPI d3d8_volume_QueryInterface(IDirect3DVolume8 *iface, REFIID riid, void **out)
void **ppobj)
{ {
TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), out);
if (IsEqualGUID(riid, &IID_IDirect3DVolume8) if (IsEqualGUID(riid, &IID_IDirect3DVolume8)
|| IsEqualGUID(riid, &IID_IUnknown)) || IsEqualGUID(riid, &IID_IUnknown))
{ {
IUnknown_AddRef(iface); IUnknown_AddRef(iface);
*ppobj = iface; *out = iface;
return S_OK; return S_OK;
} }
WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid));
*ppobj = NULL; *out = NULL;
return E_NOINTERFACE; return E_NOINTERFACE;
} }
static ULONG WINAPI IDirect3DVolume8Impl_AddRef(IDirect3DVolume8 *iface) static ULONG WINAPI d3d8_volume_AddRef(IDirect3DVolume8 *iface)
{ {
IDirect3DVolume8Impl *This = impl_from_IDirect3DVolume8(iface); struct d3d8_volume *volume = impl_from_IDirect3DVolume8(iface);
TRACE("iface %p.\n", iface); TRACE("iface %p.\n", iface);
if (This->forwardReference) { if (volume->forwardReference)
{
/* Forward to the containerParent */ /* Forward to the containerParent */
TRACE("(%p) : Forwarding to %p\n", This, This->forwardReference); TRACE("Forwarding to %p,\n", volume->forwardReference);
return IUnknown_AddRef(This->forwardReference); return IUnknown_AddRef(volume->forwardReference);
} else { }
else
{
/* No container, handle our own refcounting */ /* No container, handle our own refcounting */
ULONG ref = InterlockedIncrement(&This->ref); ULONG ref = InterlockedIncrement(&volume->refcount);
TRACE("%p increasing refcount to %u.\n", iface, ref); TRACE("%p increasing refcount to %u.\n", iface, ref);
if (ref == 1) if (ref == 1)
{ {
wined3d_mutex_lock(); wined3d_mutex_lock();
wined3d_volume_incref(This->wined3d_volume); wined3d_volume_incref(volume->wined3d_volume);
wined3d_mutex_unlock(); wined3d_mutex_unlock();
} }
@ -74,26 +76,29 @@ static ULONG WINAPI IDirect3DVolume8Impl_AddRef(IDirect3DVolume8 *iface)
} }
} }
static ULONG WINAPI IDirect3DVolume8Impl_Release(IDirect3DVolume8 *iface) static ULONG WINAPI d3d8_volume_Release(IDirect3DVolume8 *iface)
{ {
IDirect3DVolume8Impl *This = impl_from_IDirect3DVolume8(iface); struct d3d8_volume *volume = impl_from_IDirect3DVolume8(iface);
TRACE("iface %p.\n", iface); TRACE("iface %p.\n", iface);
if (This->forwardReference) { if (volume->forwardReference)
{
/* Forward to the containerParent */ /* Forward to the containerParent */
TRACE("(%p) : Forwarding to %p\n", This, This->forwardReference); TRACE("Forwarding to %p.\n", volume->forwardReference);
return IUnknown_Release(This->forwardReference); return IUnknown_Release(volume->forwardReference);
} }
else { else
{
/* No container, handle our own refcounting */ /* No container, handle our own refcounting */
ULONG ref = InterlockedDecrement(&This->ref); ULONG ref = InterlockedDecrement(&volume->refcount);
TRACE("%p decreasing refcount to %u.\n", iface, ref); TRACE("%p decreasing refcount to %u.\n", iface, ref);
if (ref == 0) { if (!ref)
{
wined3d_mutex_lock(); wined3d_mutex_lock();
wined3d_volume_decref(This->wined3d_volume); wined3d_volume_decref(volume->wined3d_volume);
wined3d_mutex_unlock(); wined3d_mutex_unlock();
} }
@ -101,16 +106,15 @@ static ULONG WINAPI IDirect3DVolume8Impl_Release(IDirect3DVolume8 *iface)
} }
} }
static HRESULT WINAPI IDirect3DVolume8Impl_GetDevice(IDirect3DVolume8 *iface, static HRESULT WINAPI d3d8_volume_GetDevice(IDirect3DVolume8 *iface, IDirect3DDevice8 **device)
IDirect3DDevice8 **device)
{ {
IDirect3DVolume8Impl *This = impl_from_IDirect3DVolume8(iface); struct d3d8_volume *volume = impl_from_IDirect3DVolume8(iface);
IDirect3DResource8 *resource; IDirect3DResource8 *resource;
HRESULT hr; HRESULT hr;
TRACE("iface %p, device %p.\n", iface, device); TRACE("iface %p, device %p.\n", iface, device);
hr = IUnknown_QueryInterface(This->forwardReference, &IID_IDirect3DResource8, (void **)&resource); hr = IUnknown_QueryInterface(volume->forwardReference, &IID_IDirect3DResource8, (void **)&resource);
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
{ {
hr = IDirect3DResource8_GetDevice(resource, device); hr = IDirect3DResource8_GetDevice(resource, device);
@ -122,86 +126,86 @@ static HRESULT WINAPI IDirect3DVolume8Impl_GetDevice(IDirect3DVolume8 *iface,
return hr; return hr;
} }
static HRESULT WINAPI IDirect3DVolume8Impl_SetPrivateData(IDirect3DVolume8 *iface, REFGUID refguid, static HRESULT WINAPI d3d8_volume_SetPrivateData(IDirect3DVolume8 *iface, REFGUID guid,
const void *pData, DWORD SizeOfData, DWORD Flags) const void *data, DWORD data_size, DWORD flags)
{ {
IDirect3DVolume8Impl *This = impl_from_IDirect3DVolume8(iface); struct d3d8_volume *volume = impl_from_IDirect3DVolume8(iface);
struct wined3d_resource *resource; struct wined3d_resource *resource;
HRESULT hr; HRESULT hr;
TRACE("iface %p, guid %s, data %p, data_size %u, flags %#x.\n", TRACE("iface %p, guid %s, data %p, data_size %u, flags %#x.\n",
iface, debugstr_guid(refguid), pData, SizeOfData, Flags); iface, debugstr_guid(guid), data, data_size, flags);
wined3d_mutex_lock(); wined3d_mutex_lock();
resource = wined3d_volume_get_resource(This->wined3d_volume); resource = wined3d_volume_get_resource(volume->wined3d_volume);
hr = wined3d_resource_set_private_data(resource, refguid, pData, SizeOfData, Flags); hr = wined3d_resource_set_private_data(resource, guid, data, data_size, flags);
wined3d_mutex_unlock(); wined3d_mutex_unlock();
return hr; return hr;
} }
static HRESULT WINAPI IDirect3DVolume8Impl_GetPrivateData(IDirect3DVolume8 *iface, REFGUID refguid, static HRESULT WINAPI d3d8_volume_GetPrivateData(IDirect3DVolume8 *iface, REFGUID guid,
void *pData, DWORD *pSizeOfData) void *data, DWORD *data_size)
{ {
IDirect3DVolume8Impl *This = impl_from_IDirect3DVolume8(iface); struct d3d8_volume *volume = impl_from_IDirect3DVolume8(iface);
struct wined3d_resource *resource; struct wined3d_resource *resource;
HRESULT hr; HRESULT hr;
TRACE("iface %p, guid %s, data %p, data_size %p.\n", TRACE("iface %p, guid %s, data %p, data_size %p.\n",
iface, debugstr_guid(refguid), pData, pSizeOfData); iface, debugstr_guid(guid), data, data_size);
wined3d_mutex_lock(); wined3d_mutex_lock();
resource = wined3d_volume_get_resource(This->wined3d_volume); resource = wined3d_volume_get_resource(volume->wined3d_volume);
hr = wined3d_resource_get_private_data(resource, refguid, pData, pSizeOfData); hr = wined3d_resource_get_private_data(resource, guid, data, data_size);
wined3d_mutex_unlock(); wined3d_mutex_unlock();
return hr; return hr;
} }
static HRESULT WINAPI IDirect3DVolume8Impl_FreePrivateData(IDirect3DVolume8 *iface, REFGUID refguid) static HRESULT WINAPI d3d8_volume_FreePrivateData(IDirect3DVolume8 *iface, REFGUID guid)
{ {
IDirect3DVolume8Impl *This = impl_from_IDirect3DVolume8(iface); struct d3d8_volume *volume = impl_from_IDirect3DVolume8(iface);
struct wined3d_resource *resource; struct wined3d_resource *resource;
HRESULT hr; HRESULT hr;
TRACE("iface %p, guid %s.\n", iface, debugstr_guid(refguid)); TRACE("iface %p, guid %s.\n", iface, debugstr_guid(guid));
wined3d_mutex_lock(); wined3d_mutex_lock();
resource = wined3d_volume_get_resource(This->wined3d_volume); resource = wined3d_volume_get_resource(volume->wined3d_volume);
hr = wined3d_resource_free_private_data(resource, refguid); hr = wined3d_resource_free_private_data(resource, guid);
wined3d_mutex_unlock(); wined3d_mutex_unlock();
return hr; return hr;
} }
static HRESULT WINAPI IDirect3DVolume8Impl_GetContainer(IDirect3DVolume8 *iface, REFIID riid, static HRESULT WINAPI d3d8_volume_GetContainer(IDirect3DVolume8 *iface, REFIID riid, void **container)
void **ppContainer)
{ {
IDirect3DVolume8Impl *This = impl_from_IDirect3DVolume8(iface); struct d3d8_volume *volume = impl_from_IDirect3DVolume8(iface);
HRESULT res; HRESULT res;
TRACE("iface %p, riid %s, container %p.\n", TRACE("iface %p, riid %s, container %p.\n",
iface, debugstr_guid(riid), ppContainer); iface, debugstr_guid(riid), container);
if (!This->container) return E_NOINTERFACE; if (!volume->container)
return E_NOINTERFACE;
res = IUnknown_QueryInterface(This->container, riid, ppContainer); res = IUnknown_QueryInterface(volume->container, riid, container);
TRACE("Returning ppContainer %p, *ppContainer %p\n", ppContainer, *ppContainer); TRACE("Returning %p.\n", *container);
return res; return res;
} }
static HRESULT WINAPI IDirect3DVolume8Impl_GetDesc(IDirect3DVolume8 *iface, D3DVOLUME_DESC *desc) static HRESULT WINAPI d3d8_volume_GetDesc(IDirect3DVolume8 *iface, D3DVOLUME_DESC *desc)
{ {
IDirect3DVolume8Impl *This = impl_from_IDirect3DVolume8(iface); struct d3d8_volume *volume = impl_from_IDirect3DVolume8(iface);
struct wined3d_resource_desc wined3d_desc; struct wined3d_resource_desc wined3d_desc;
struct wined3d_resource *wined3d_resource; struct wined3d_resource *wined3d_resource;
TRACE("iface %p, desc %p.\n", iface, desc); TRACE("iface %p, desc %p.\n", iface, desc);
wined3d_mutex_lock(); wined3d_mutex_lock();
wined3d_resource = wined3d_volume_get_resource(This->wined3d_volume); wined3d_resource = wined3d_volume_get_resource(volume->wined3d_volume);
wined3d_resource_get_desc(wined3d_resource, &wined3d_desc); wined3d_resource_get_desc(wined3d_resource, &wined3d_desc);
wined3d_mutex_unlock(); wined3d_mutex_unlock();
@ -217,10 +221,10 @@ static HRESULT WINAPI IDirect3DVolume8Impl_GetDesc(IDirect3DVolume8 *iface, D3DV
return D3D_OK; return D3D_OK;
} }
static HRESULT WINAPI IDirect3DVolume8Impl_LockBox(IDirect3DVolume8 *iface, static HRESULT WINAPI d3d8_volume_LockBox(IDirect3DVolume8 *iface,
D3DLOCKED_BOX *locked_box, const D3DBOX *box, DWORD flags) D3DLOCKED_BOX *locked_box, const D3DBOX *box, DWORD flags)
{ {
IDirect3DVolume8Impl *This = impl_from_IDirect3DVolume8(iface); struct d3d8_volume *volume = impl_from_IDirect3DVolume8(iface);
struct wined3d_map_desc map_desc; struct wined3d_map_desc map_desc;
HRESULT hr; HRESULT hr;
@ -228,7 +232,7 @@ static HRESULT WINAPI IDirect3DVolume8Impl_LockBox(IDirect3DVolume8 *iface,
iface, locked_box, box, flags); iface, locked_box, box, flags);
wined3d_mutex_lock(); wined3d_mutex_lock();
hr = wined3d_volume_map(This->wined3d_volume, &map_desc, (const struct wined3d_box *)box, flags); hr = wined3d_volume_map(volume->wined3d_volume, &map_desc, (const struct wined3d_box *)box, flags);
wined3d_mutex_unlock(); wined3d_mutex_unlock();
locked_box->RowPitch = map_desc.row_pitch; locked_box->RowPitch = map_desc.row_pitch;
@ -238,35 +242,35 @@ static HRESULT WINAPI IDirect3DVolume8Impl_LockBox(IDirect3DVolume8 *iface,
return hr; return hr;
} }
static HRESULT WINAPI IDirect3DVolume8Impl_UnlockBox(IDirect3DVolume8 *iface) static HRESULT WINAPI d3d8_volume_UnlockBox(IDirect3DVolume8 *iface)
{ {
IDirect3DVolume8Impl *This = impl_from_IDirect3DVolume8(iface); struct d3d8_volume *volume = impl_from_IDirect3DVolume8(iface);
HRESULT hr; HRESULT hr;
TRACE("iface %p.\n", iface); TRACE("iface %p.\n", iface);
wined3d_mutex_lock(); wined3d_mutex_lock();
hr = wined3d_volume_unmap(This->wined3d_volume); hr = wined3d_volume_unmap(volume->wined3d_volume);
wined3d_mutex_unlock(); wined3d_mutex_unlock();
return hr; return hr;
} }
static const IDirect3DVolume8Vtbl Direct3DVolume8_Vtbl = static const IDirect3DVolume8Vtbl d3d8_volume_vtbl =
{ {
/* IUnknown */ /* IUnknown */
IDirect3DVolume8Impl_QueryInterface, d3d8_volume_QueryInterface,
IDirect3DVolume8Impl_AddRef, d3d8_volume_AddRef,
IDirect3DVolume8Impl_Release, d3d8_volume_Release,
/* IDirect3DVolume8 */ /* IDirect3DVolume8 */
IDirect3DVolume8Impl_GetDevice, d3d8_volume_GetDevice,
IDirect3DVolume8Impl_SetPrivateData, d3d8_volume_SetPrivateData,
IDirect3DVolume8Impl_GetPrivateData, d3d8_volume_GetPrivateData,
IDirect3DVolume8Impl_FreePrivateData, d3d8_volume_FreePrivateData,
IDirect3DVolume8Impl_GetContainer, d3d8_volume_GetContainer,
IDirect3DVolume8Impl_GetDesc, d3d8_volume_GetDesc,
IDirect3DVolume8Impl_LockBox, d3d8_volume_LockBox,
IDirect3DVolume8Impl_UnlockBox d3d8_volume_UnlockBox,
}; };
static void STDMETHODCALLTYPE volume_wined3d_object_destroyed(void *parent) static void STDMETHODCALLTYPE volume_wined3d_object_destroyed(void *parent)
@ -279,13 +283,13 @@ static const struct wined3d_parent_ops d3d8_volume_wined3d_parent_ops =
volume_wined3d_object_destroyed, volume_wined3d_object_destroyed,
}; };
HRESULT volume_init(IDirect3DVolume8Impl *volume, struct d3d8_device *device, UINT width, UINT height, HRESULT volume_init(struct d3d8_volume *volume, struct d3d8_device *device, UINT width, UINT height,
UINT depth, DWORD usage, enum wined3d_format_id format, enum wined3d_pool pool) UINT depth, DWORD usage, enum wined3d_format_id format, enum wined3d_pool pool)
{ {
HRESULT hr; HRESULT hr;
volume->IDirect3DVolume8_iface.lpVtbl = &Direct3DVolume8_Vtbl; volume->IDirect3DVolume8_iface.lpVtbl = &d3d8_volume_vtbl;
volume->ref = 1; volume->refcount = 1;
hr = wined3d_volume_create(device->wined3d_device, width, height, depth, usage, hr = wined3d_volume_create(device->wined3d_device, width, height, depth, usage,
format, pool, volume, &d3d8_volume_wined3d_parent_ops, &volume->wined3d_volume); format, pool, volume, &d3d8_volume_wined3d_parent_ops, &volume->wined3d_volume);