* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
-#include "config.h"
#include "d3d9_private.h"
-WINE_DEFAULT_DEBUG_CHANNEL(d3d9);
-
-static inline IDirect3DVolume9Impl *impl_from_IDirect3DVolume9(IDirect3DVolume9 *iface)
+static inline struct d3d9_volume *impl_from_IDirect3DVolume9(IDirect3DVolume9 *iface)
{
- return CONTAINING_RECORD(iface, IDirect3DVolume9Impl, IDirect3DVolume9_iface);
+ return CONTAINING_RECORD(iface, struct d3d9_volume, IDirect3DVolume9_iface);
}
-static HRESULT WINAPI IDirect3DVolume9Impl_QueryInterface(IDirect3DVolume9 *iface, REFIID riid,
- void **ppobj)
+static HRESULT WINAPI d3d9_volume_QueryInterface(IDirect3DVolume9 *iface, REFIID riid, void **out)
{
- IDirect3DVolume9Impl *This = impl_from_IDirect3DVolume9(iface);
-
- TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj);
+ TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out);
- if (IsEqualGUID(riid, &IID_IUnknown)
- || IsEqualGUID(riid, &IID_IDirect3DVolume9)) {
+ if (IsEqualGUID(riid, &IID_IDirect3DVolume9)
+ || IsEqualGUID(riid, &IID_IUnknown))
+ {
IDirect3DVolume9_AddRef(iface);
- *ppobj = This;
+ *out = iface;
return S_OK;
}
- WARN("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppobj);
- *ppobj = NULL;
+ WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid));
+
+ *out = NULL;
return E_NOINTERFACE;
}
-static ULONG WINAPI IDirect3DVolume9Impl_AddRef(IDirect3DVolume9 *iface)
+static ULONG WINAPI d3d9_volume_AddRef(IDirect3DVolume9 *iface)
{
- IDirect3DVolume9Impl *This = impl_from_IDirect3DVolume9(iface);
+ struct d3d9_volume *volume = impl_from_IDirect3DVolume9(iface);
TRACE("iface %p.\n", iface);
+ TRACE("Forwarding to %p.\n", volume->texture);
- if (This->forwardReference) {
- /* Forward refcounting */
- TRACE("(%p) : Forwarding to %p\n", This, This->forwardReference);
- return IUnknown_AddRef(This->forwardReference);
- } else {
- /* No container, handle our own refcounting */
- ULONG ref = InterlockedIncrement(&This->ref);
-
- TRACE("%p increasing refcount to %u.\n", iface, ref);
-
- if (ref == 1)
- {
- wined3d_mutex_lock();
- wined3d_volume_incref(This->wined3d_volume);
- wined3d_mutex_unlock();
- }
-
- return ref;
- }
+ return IDirect3DBaseTexture9_AddRef(&volume->texture->IDirect3DBaseTexture9_iface);
}
-static ULONG WINAPI IDirect3DVolume9Impl_Release(IDirect3DVolume9 *iface)
+static ULONG WINAPI d3d9_volume_Release(IDirect3DVolume9 *iface)
{
- IDirect3DVolume9Impl *This = impl_from_IDirect3DVolume9(iface);
+ struct d3d9_volume *volume = impl_from_IDirect3DVolume9(iface);
TRACE("iface %p.\n", iface);
+ TRACE("Forwarding to %p.\n", volume->texture);
- if (This->forwardReference) {
- /* Forward refcounting */
- TRACE("(%p) : Forwarding to %p\n", This, This->forwardReference);
- return IUnknown_Release(This->forwardReference);
- } else {
- /* No container, handle our own refcounting */
- ULONG ref = InterlockedDecrement(&This->ref);
-
- TRACE("%p decreasing refcount to %u.\n", iface, ref);
-
- if (ref == 0) {
- wined3d_mutex_lock();
- wined3d_volume_decref(This->wined3d_volume);
- wined3d_mutex_unlock();
- }
-
- return ref;
- }
+ return IDirect3DBaseTexture9_Release(&volume->texture->IDirect3DBaseTexture9_iface);
}
-static HRESULT WINAPI IDirect3DVolume9Impl_GetDevice(IDirect3DVolume9 *iface,
- IDirect3DDevice9 **device)
+static HRESULT WINAPI d3d9_volume_GetDevice(IDirect3DVolume9 *iface, IDirect3DDevice9 **device)
{
- IDirect3DVolume9Impl *This = impl_from_IDirect3DVolume9(iface);
- IDirect3DResource9 *resource;
- HRESULT hr;
+ struct d3d9_volume *volume = impl_from_IDirect3DVolume9(iface);
TRACE("iface %p, device %p.\n", iface, device);
- hr = IUnknown_QueryInterface(This->forwardReference, &IID_IDirect3DResource9, (void **)&resource);
- if (SUCCEEDED(hr))
- {
- hr = IDirect3DResource9_GetDevice(resource, device);
- IDirect3DResource9_Release(resource);
-
- TRACE("Returning device %p.\n", *device);
- }
-
- return hr;
+ return IDirect3DBaseTexture9_GetDevice(&volume->texture->IDirect3DBaseTexture9_iface, device);
}
-static HRESULT WINAPI IDirect3DVolume9Impl_SetPrivateData(IDirect3DVolume9 *iface, REFGUID refguid,
- const void *pData, DWORD SizeOfData, DWORD Flags)
+static HRESULT WINAPI d3d9_volume_SetPrivateData(IDirect3DVolume9 *iface, REFGUID guid,
+ const void *data, DWORD data_size, DWORD flags)
{
- IDirect3DVolume9Impl *This = impl_from_IDirect3DVolume9(iface);
- HRESULT hr;
-
+ struct d3d9_volume *volume = impl_from_IDirect3DVolume9(iface);
TRACE("iface %p, guid %s, data %p, data_size %u, flags %#x.\n",
- iface, debugstr_guid(refguid), pData, SizeOfData, Flags);
-
- wined3d_mutex_lock();
- hr = wined3d_volume_set_private_data(This->wined3d_volume, refguid, pData, SizeOfData, Flags);
- wined3d_mutex_unlock();
+ iface, debugstr_guid(guid), data, data_size, flags);
- return hr;
+ return d3d9_resource_set_private_data(&volume->resource, guid, data, data_size, flags);
}
-static HRESULT WINAPI IDirect3DVolume9Impl_GetPrivateData(IDirect3DVolume9 *iface, REFGUID refguid,
- void *pData, DWORD *pSizeOfData)
+static HRESULT WINAPI d3d9_volume_GetPrivateData(IDirect3DVolume9 *iface, REFGUID guid,
+ void *data, DWORD *data_size)
{
- IDirect3DVolume9Impl *This = impl_from_IDirect3DVolume9(iface);
- HRESULT hr;
-
+ struct d3d9_volume *volume = impl_from_IDirect3DVolume9(iface);
TRACE("iface %p, guid %s, data %p, data_size %p.\n",
- iface, debugstr_guid(refguid), pData, pSizeOfData);
-
- wined3d_mutex_lock();
- hr = wined3d_volume_get_private_data(This->wined3d_volume, refguid, pData, pSizeOfData);
- wined3d_mutex_unlock();
+ iface, debugstr_guid(guid), data, data_size);
- return hr;
+ return d3d9_resource_get_private_data(&volume->resource, guid, data, data_size);
}
-static HRESULT WINAPI IDirect3DVolume9Impl_FreePrivateData(IDirect3DVolume9 *iface, REFGUID refguid)
+static HRESULT WINAPI d3d9_volume_FreePrivateData(IDirect3DVolume9 *iface, REFGUID guid)
{
- IDirect3DVolume9Impl *This = impl_from_IDirect3DVolume9(iface);
- HRESULT hr;
-
- TRACE("iface %p, guid %s.\n", iface, debugstr_guid(refguid));
-
- wined3d_mutex_lock();
- hr = wined3d_volume_free_private_data(This->wined3d_volume, refguid);
- wined3d_mutex_unlock();
+ struct d3d9_volume *volume = impl_from_IDirect3DVolume9(iface);
+ TRACE("iface %p, guid %s.\n", iface, debugstr_guid(guid));
- return hr;
+ return d3d9_resource_free_private_data(&volume->resource, guid);
}
-static HRESULT WINAPI IDirect3DVolume9Impl_GetContainer(IDirect3DVolume9 *iface, REFIID riid,
- void **ppContainer)
+static HRESULT WINAPI d3d9_volume_GetContainer(IDirect3DVolume9 *iface, REFIID riid, void **container)
{
- IDirect3DVolume9Impl *This = impl_from_IDirect3DVolume9(iface);
- HRESULT res;
-
- TRACE("iface %p, riid %s, container %p.\n", iface, debugstr_guid(riid), ppContainer);
-
- if (!This->container) return E_NOINTERFACE;
+ struct d3d9_volume *volume = impl_from_IDirect3DVolume9(iface);
- res = IUnknown_QueryInterface(This->container, riid, ppContainer);
+ TRACE("iface %p, riid %s, container %p.\n", iface, debugstr_guid(riid), container);
- TRACE("Returning ppContainer %p, *ppContainer %p\n", ppContainer, *ppContainer);
-
- return res;
+ return IDirect3DBaseTexture9_QueryInterface(&volume->texture->IDirect3DBaseTexture9_iface, riid, container);
}
-static HRESULT WINAPI IDirect3DVolume9Impl_GetDesc(IDirect3DVolume9 *iface, D3DVOLUME_DESC *desc)
+static HRESULT WINAPI d3d9_volume_GetDesc(IDirect3DVolume9 *iface, D3DVOLUME_DESC *desc)
{
- IDirect3DVolume9Impl *This = impl_from_IDirect3DVolume9(iface);
- struct wined3d_resource_desc wined3d_desc;
- struct wined3d_resource *wined3d_resource;
+ struct d3d9_volume *volume = impl_from_IDirect3DVolume9(iface);
+ struct wined3d_sub_resource_desc wined3d_desc;
TRACE("iface %p, desc %p.\n", iface, desc);
wined3d_mutex_lock();
- wined3d_resource = wined3d_volume_get_resource(This->wined3d_volume);
- wined3d_resource_get_desc(wined3d_resource, &wined3d_desc);
+ wined3d_texture_get_sub_resource_desc(volume->wined3d_texture, volume->sub_resource_idx, &wined3d_desc);
wined3d_mutex_unlock();
desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format);
- desc->Type = wined3d_desc.resource_type;
- desc->Usage = wined3d_desc.usage;
+ desc->Type = D3DRTYPE_VOLUME;
+ desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK;
desc->Pool = wined3d_desc.pool;
desc->Width = wined3d_desc.width;
desc->Height = wined3d_desc.height;
return D3D_OK;
}
-static HRESULT WINAPI IDirect3DVolume9Impl_LockBox(IDirect3DVolume9 *iface,
- D3DLOCKED_BOX *pLockedVolume, const D3DBOX *pBox, DWORD Flags)
+static HRESULT WINAPI d3d9_volume_LockBox(IDirect3DVolume9 *iface,
+ D3DLOCKED_BOX *locked_box, const D3DBOX *box, DWORD flags)
{
- IDirect3DVolume9Impl *This = impl_from_IDirect3DVolume9(iface);
+ struct d3d9_volume *volume = impl_from_IDirect3DVolume9(iface);
+ struct wined3d_map_desc map_desc;
HRESULT hr;
TRACE("iface %p, locked_box %p, box %p, flags %#x.\n",
- iface, pLockedVolume, pBox, Flags);
+ iface, locked_box, box, flags);
wined3d_mutex_lock();
- hr = wined3d_volume_map(This->wined3d_volume, (WINED3DLOCKED_BOX *)pLockedVolume,
- (const WINED3DBOX *)pBox, Flags);
+ if (FAILED(hr = wined3d_resource_map(wined3d_texture_get_resource(volume->wined3d_texture),
+ volume->sub_resource_idx, &map_desc, (const struct wined3d_box *)box, flags)))
+ map_desc.data = NULL;
wined3d_mutex_unlock();
+ locked_box->RowPitch = map_desc.row_pitch;
+ locked_box->SlicePitch = map_desc.slice_pitch;
+ locked_box->pBits = map_desc.data;
+
return hr;
}
-static HRESULT WINAPI IDirect3DVolume9Impl_UnlockBox(IDirect3DVolume9 *iface)
+static HRESULT WINAPI d3d9_volume_UnlockBox(IDirect3DVolume9 *iface)
{
- IDirect3DVolume9Impl *This = impl_from_IDirect3DVolume9(iface);
+ struct d3d9_volume *volume = impl_from_IDirect3DVolume9(iface);
HRESULT hr;
TRACE("iface %p.\n", iface);
wined3d_mutex_lock();
- hr = wined3d_volume_unmap(This->wined3d_volume);
+ hr = wined3d_resource_unmap(wined3d_texture_get_resource(volume->wined3d_texture), volume->sub_resource_idx);
wined3d_mutex_unlock();
+ if (hr == WINEDDERR_NOTLOCKED)
+ return D3DERR_INVALIDCALL;
return hr;
}
-static const IDirect3DVolume9Vtbl Direct3DVolume9_Vtbl =
+static const struct IDirect3DVolume9Vtbl d3d9_volume_vtbl =
{
/* IUnknown */
- IDirect3DVolume9Impl_QueryInterface,
- IDirect3DVolume9Impl_AddRef,
- IDirect3DVolume9Impl_Release,
+ d3d9_volume_QueryInterface,
+ d3d9_volume_AddRef,
+ d3d9_volume_Release,
/* IDirect3DVolume9 */
- IDirect3DVolume9Impl_GetDevice,
- IDirect3DVolume9Impl_SetPrivateData,
- IDirect3DVolume9Impl_GetPrivateData,
- IDirect3DVolume9Impl_FreePrivateData,
- IDirect3DVolume9Impl_GetContainer,
- IDirect3DVolume9Impl_GetDesc,
- IDirect3DVolume9Impl_LockBox,
- IDirect3DVolume9Impl_UnlockBox
+ d3d9_volume_GetDevice,
+ d3d9_volume_SetPrivateData,
+ d3d9_volume_GetPrivateData,
+ d3d9_volume_FreePrivateData,
+ d3d9_volume_GetContainer,
+ d3d9_volume_GetDesc,
+ d3d9_volume_LockBox,
+ d3d9_volume_UnlockBox,
};
static void STDMETHODCALLTYPE volume_wined3d_object_destroyed(void *parent)
{
- HeapFree(GetProcessHeap(), 0, parent);
+ struct d3d9_volume *volume = parent;
+ d3d9_resource_cleanup(&volume->resource);
+ HeapFree(GetProcessHeap(), 0, volume);
}
static const struct wined3d_parent_ops d3d9_volume_wined3d_parent_ops =
volume_wined3d_object_destroyed,
};
-HRESULT volume_init(IDirect3DVolume9Impl *volume, IDirect3DDevice9Impl *device, UINT width, UINT height,
- UINT depth, DWORD usage, enum wined3d_format_id format, WINED3DPOOL pool)
+void volume_init(struct d3d9_volume *volume, struct wined3d_texture *wined3d_texture,
+ unsigned int sub_resource_idx, const struct wined3d_parent_ops **parent_ops)
{
- HRESULT hr;
+ volume->IDirect3DVolume9_iface.lpVtbl = &d3d9_volume_vtbl;
+ d3d9_resource_init(&volume->resource);
+ volume->resource.refcount = 0;
+ volume->texture = wined3d_texture_get_parent(wined3d_texture);
+ volume->wined3d_texture = wined3d_texture;
+ volume->sub_resource_idx = sub_resource_idx;
- volume->IDirect3DVolume9_iface.lpVtbl = &Direct3DVolume9_Vtbl;
- volume->ref = 1;
-
- hr = wined3d_volume_create(device->wined3d_device, width, height, depth, usage & WINED3DUSAGE_MASK,
- format, pool, volume, &d3d9_volume_wined3d_parent_ops, &volume->wined3d_volume);
- if (FAILED(hr))
- {
- WARN("Failed to create wined3d volume, hr %#x.\n", hr);
- return hr;
- }
-
- return D3D_OK;
+ *parent_ops = &d3d9_volume_wined3d_parent_ops;
}
projects / reactos.git / blobdiff