Commit 9a795c52 authored by Stefan Dösinger's avatar Stefan Dösinger Committed by Alexandre Julliard

d3d8: Use the private store api for surfaces.

parent 9be18d5f
...@@ -150,52 +150,28 @@ static HRESULT WINAPI d3d8_surface_SetPrivateData(IDirect3DSurface8 *iface, REFG ...@@ -150,52 +150,28 @@ static HRESULT WINAPI d3d8_surface_SetPrivateData(IDirect3DSurface8 *iface, REFG
const void *data, DWORD data_size, DWORD flags) const void *data, DWORD data_size, DWORD flags)
{ {
struct d3d8_surface *surface = impl_from_IDirect3DSurface8(iface); struct d3d8_surface *surface = impl_from_IDirect3DSurface8(iface);
struct wined3d_resource *resource;
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(guid), data, data_size, flags); iface, debugstr_guid(guid), data, data_size, flags);
wined3d_mutex_lock(); return d3d8_resource_set_private_data(&surface->resource, guid, data, data_size, flags);
resource = wined3d_surface_get_resource(surface->wined3d_surface);
hr = wined3d_resource_set_private_data(resource, guid, data, data_size, flags);
wined3d_mutex_unlock();
return hr;
} }
static HRESULT WINAPI d3d8_surface_GetPrivateData(IDirect3DSurface8 *iface, REFGUID guid, static HRESULT WINAPI d3d8_surface_GetPrivateData(IDirect3DSurface8 *iface, REFGUID guid,
void *data, DWORD *data_size) void *data, DWORD *data_size)
{ {
struct d3d8_surface *surface = impl_from_IDirect3DSurface8(iface); struct d3d8_surface *surface = impl_from_IDirect3DSurface8(iface);
struct wined3d_resource *resource;
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(guid), data, data_size); iface, debugstr_guid(guid), data, data_size);
wined3d_mutex_lock(); return d3d8_resource_get_private_data(&surface->resource, guid, data, data_size);
resource = wined3d_surface_get_resource(surface->wined3d_surface);
hr = wined3d_resource_get_private_data(resource, guid, data, data_size);
wined3d_mutex_unlock();
return hr;
} }
static HRESULT WINAPI d3d8_surface_FreePrivateData(IDirect3DSurface8 *iface, REFGUID guid) static HRESULT WINAPI d3d8_surface_FreePrivateData(IDirect3DSurface8 *iface, REFGUID guid)
{ {
struct d3d8_surface *surface = impl_from_IDirect3DSurface8(iface); struct d3d8_surface *surface = impl_from_IDirect3DSurface8(iface);
struct wined3d_resource *resource;
HRESULT hr;
TRACE("iface %p, guid %s.\n", iface, debugstr_guid(guid)); TRACE("iface %p, guid %s.\n", iface, debugstr_guid(guid));
wined3d_mutex_lock(); return d3d8_resource_free_private_data(&surface->resource, guid);
resource = wined3d_surface_get_resource(surface->wined3d_surface);
hr = wined3d_resource_free_private_data(resource, guid);
wined3d_mutex_unlock();
return hr;
} }
static HRESULT WINAPI d3d8_surface_GetContainer(IDirect3DSurface8 *iface, REFIID riid, void **container) static HRESULT WINAPI d3d8_surface_GetContainer(IDirect3DSurface8 *iface, REFIID riid, void **container)
......
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