TRACE("iface %p.\n", iface);
- if (surface->forwardReference)
+ if (surface->texture)
{
- TRACE("Forwarding to %p.\n", surface->forwardReference);
- return IUnknown_AddRef(surface->forwardReference);
+ TRACE("Forwarding to %p.\n", surface->texture);
+ return IDirect3DBaseTexture9_AddRef(&surface->texture->IDirect3DBaseTexture9_iface);
}
refcount = InterlockedIncrement(&surface->resource.refcount);
if (surface->parent_device)
IDirect3DDevice9Ex_AddRef(surface->parent_device);
wined3d_mutex_lock();
- wined3d_surface_incref(surface->wined3d_surface);
+ if (surface->wined3d_rtv)
+ wined3d_rendertarget_view_incref(surface->wined3d_rtv);
+ wined3d_texture_incref(surface->wined3d_texture);
wined3d_mutex_unlock();
}
TRACE("iface %p.\n", iface);
- if (surface->forwardReference)
+ if (surface->texture)
{
- TRACE("Forwarding to %p.\n", surface->forwardReference);
- return IUnknown_Release(surface->forwardReference);
+ TRACE("Forwarding to %p.\n", surface->texture);
+ return IDirect3DBaseTexture9_Release(&surface->texture->IDirect3DBaseTexture9_iface);
+ }
+
+ if (!surface->resource.refcount)
+ {
+ WARN("Surface does not have any references.\n");
+ return 0;
}
refcount = InterlockedDecrement(&surface->resource.refcount);
IDirect3DDevice9Ex *parent_device = surface->parent_device;
wined3d_mutex_lock();
- wined3d_surface_decref(surface->wined3d_surface);
+ if (surface->wined3d_rtv)
+ wined3d_rendertarget_view_decref(surface->wined3d_rtv);
+ wined3d_texture_decref(surface->wined3d_texture);
wined3d_mutex_unlock();
/* Release the device last, as it may cause the device to be destroyed. */
TRACE("iface %p, device %p.\n", iface, device);
- if (surface->forwardReference)
- {
- IDirect3DResource9 *resource;
- HRESULT hr;
-
- hr = IUnknown_QueryInterface(surface->forwardReference, &IID_IDirect3DResource9, (void **)&resource);
- if (SUCCEEDED(hr))
- {
- hr = IDirect3DResource9_GetDevice(resource, device);
- IDirect3DResource9_Release(resource);
-
- TRACE("Returning device %p.\n", *device);
- }
-
- return hr;
- }
+ if (surface->texture)
+ return IDirect3DBaseTexture9_GetDevice(&surface->texture->IDirect3DBaseTexture9_iface, device);
*device = (IDirect3DDevice9 *)surface->parent_device;
IDirect3DDevice9_AddRef(*device);
static DWORD WINAPI d3d9_surface_SetPriority(IDirect3DSurface9 *iface, DWORD priority)
{
- struct d3d9_surface *surface = impl_from_IDirect3DSurface9(iface);
- DWORD ret;
-
- TRACE("iface %p, priority %u.\n", iface, priority);
-
- wined3d_mutex_lock();
- ret = wined3d_surface_set_priority(surface->wined3d_surface, priority);
- wined3d_mutex_unlock();
-
- return ret;
+ TRACE("iface %p, priority %u. Ignored on surfaces.\n", iface, priority);
+ return 0;
}
static DWORD WINAPI d3d9_surface_GetPriority(IDirect3DSurface9 *iface)
{
- struct d3d9_surface *surface = impl_from_IDirect3DSurface9(iface);
- DWORD ret;
-
- TRACE("iface %p.\n", iface);
-
- wined3d_mutex_lock();
- ret = wined3d_surface_get_priority(surface->wined3d_surface);
- wined3d_mutex_unlock();
-
- return ret;
+ TRACE("iface %p. Ignored on surfaces.\n", iface);
+ return 0;
}
static void WINAPI d3d9_surface_PreLoad(IDirect3DSurface9 *iface)
TRACE("iface %p.\n", iface);
wined3d_mutex_lock();
- wined3d_surface_preload(surface->wined3d_surface);
+ wined3d_resource_preload(wined3d_texture_get_resource(surface->wined3d_texture));
wined3d_mutex_unlock();
}
static HRESULT WINAPI d3d9_surface_GetDesc(IDirect3DSurface9 *iface, D3DSURFACE_DESC *desc)
{
struct d3d9_surface *surface = impl_from_IDirect3DSurface9(iface);
- struct wined3d_resource_desc wined3d_desc;
- struct wined3d_resource *wined3d_resource;
+ struct wined3d_sub_resource_desc wined3d_desc;
TRACE("iface %p, desc %p.\n", iface, desc);
wined3d_mutex_lock();
- wined3d_resource = wined3d_surface_get_resource(surface->wined3d_surface);
- wined3d_resource_get_desc(wined3d_resource, &wined3d_desc);
+ wined3d_texture_get_sub_resource_desc(surface->wined3d_texture, surface->sub_resource_idx, &wined3d_desc);
wined3d_mutex_unlock();
desc->Format = d3dformat_from_wined3dformat(wined3d_desc.format);
- desc->Type = wined3d_desc.resource_type;
+ desc->Type = D3DRTYPE_SURFACE;
desc->Usage = wined3d_desc.usage & WINED3DUSAGE_MASK;
desc->Pool = wined3d_desc.pool;
desc->MultiSampleType = wined3d_desc.multisample_type;
D3DLOCKED_RECT *locked_rect, const RECT *rect, DWORD flags)
{
struct d3d9_surface *surface = impl_from_IDirect3DSurface9(iface);
+ struct wined3d_box box;
struct wined3d_map_desc map_desc;
HRESULT hr;
TRACE("iface %p, locked_rect %p, rect %s, flags %#x.\n",
iface, locked_rect, wine_dbgstr_rect(rect), flags);
+ if (rect)
+ wined3d_box_set(&box, rect->left, rect->top, rect->right, rect->bottom, 0, 1);
+
wined3d_mutex_lock();
- hr = wined3d_surface_map(surface->wined3d_surface, &map_desc, rect, flags);
+ hr = wined3d_resource_map(wined3d_texture_get_resource(surface->wined3d_texture), surface->sub_resource_idx,
+ &map_desc, rect ? &box : NULL, flags);
wined3d_mutex_unlock();
if (SUCCEEDED(hr))
TRACE("iface %p.\n", iface);
wined3d_mutex_lock();
- hr = wined3d_surface_unmap(surface->wined3d_surface);
+ hr = wined3d_resource_unmap(wined3d_texture_get_resource(surface->wined3d_texture), surface->sub_resource_idx);
wined3d_mutex_unlock();
- switch(hr)
+ if (hr == WINEDDERR_NOTLOCKED)
{
- case WINEDDERR_NOTLOCKED: return D3DERR_INVALIDCALL;
- default: return hr;
+ D3DRESOURCETYPE type;
+ if (surface->texture)
+ type = IDirect3DBaseTexture9_GetType(&surface->texture->IDirect3DBaseTexture9_iface);
+ else
+ type = D3DRTYPE_SURFACE;
+ hr = type == D3DRTYPE_TEXTURE ? D3D_OK : D3DERR_INVALIDCALL;
}
+ return hr;
}
static HRESULT WINAPI d3d9_surface_GetDC(IDirect3DSurface9 *iface, HDC *dc)
TRACE("iface %p, dc %p.\n", iface, dc);
- if (!surface->getdc_supported)
- {
- WARN("Surface does not support GetDC, returning D3DERR_INVALIDCALL\n");
- /* Don't touch the DC */
- return D3DERR_INVALIDCALL;
- }
-
wined3d_mutex_lock();
- hr = wined3d_surface_getdc(surface->wined3d_surface, dc);
+ hr = wined3d_texture_get_dc(surface->wined3d_texture, surface->sub_resource_idx, dc);
wined3d_mutex_unlock();
return hr;
TRACE("iface %p, dc %p.\n", iface, dc);
wined3d_mutex_lock();
- hr = wined3d_surface_releasedc(surface->wined3d_surface, dc);
+ hr = wined3d_texture_release_dc(surface->wined3d_texture, surface->sub_resource_idx, dc);
wined3d_mutex_unlock();
- switch (hr)
- {
- case WINEDDERR_NODC: return D3DERR_INVALIDCALL;
- default: return hr;
- }
+ return hr;
}
static const struct IDirect3DSurface9Vtbl d3d9_surface_vtbl =
surface_wined3d_object_destroyed,
};
-void surface_init(struct d3d9_surface *surface, struct wined3d_surface *wined3d_surface,
- struct d3d9_device *device, const struct wined3d_parent_ops **parent_ops)
+void surface_init(struct d3d9_surface *surface, struct wined3d_texture *wined3d_texture,
+ unsigned int sub_resource_idx, const struct wined3d_parent_ops **parent_ops)
{
- struct wined3d_resource_desc desc;
+ IDirect3DBaseTexture9 *texture;
surface->IDirect3DSurface9_iface.lpVtbl = &d3d9_surface_vtbl;
d3d9_resource_init(&surface->resource);
+ surface->resource.refcount = 0;
+ list_init(&surface->rtv_entry);
+ surface->container = wined3d_texture_get_parent(wined3d_texture);
+ surface->wined3d_texture = wined3d_texture;
+ surface->sub_resource_idx = sub_resource_idx;
+
+ if (surface->container && SUCCEEDED(IUnknown_QueryInterface(surface->container,
+ &IID_IDirect3DBaseTexture9, (void **)&texture)))
+ {
+ surface->texture = unsafe_impl_from_IDirect3DBaseTexture9(texture);
+ IDirect3DBaseTexture9_Release(texture);
+ }
+
+ *parent_ops = &d3d9_surface_wined3d_parent_ops;
+}
+
+static void STDMETHODCALLTYPE view_wined3d_object_destroyed(void *parent)
+{
+ struct d3d9_surface *surface = parent;
+
+ /* If the surface reference count drops to zero, we release our reference
+ * to the view, but don't clear the pointer yet, in case e.g. a
+ * GetRenderTarget() call brings the surface back before the view is
+ * actually destroyed. When the view is destroyed, we need to clear the
+ * pointer, or a subsequent surface AddRef() would reference it again.
+ *
+ * This is safe because as long as the view still has a reference to the
+ * texture, the surface is also still alive, and we're called before the
+ * view releases that reference. */
+ surface->wined3d_rtv = NULL;
+ list_remove(&surface->rtv_entry);
+}
+
+static const struct wined3d_parent_ops d3d9_view_wined3d_parent_ops =
+{
+ view_wined3d_object_destroyed,
+};
- wined3d_resource_get_desc(wined3d_surface_get_resource(wined3d_surface), &desc);
- switch (d3dformat_from_wined3dformat(desc.format))
+struct d3d9_device *d3d9_surface_get_device(const struct d3d9_surface *surface)
+{
+ IDirect3DDevice9Ex *device;
+ device = surface->texture ? surface->texture->parent_device : surface->parent_device;
+ return impl_from_IDirect3DDevice9Ex(device);
+}
+
+struct wined3d_rendertarget_view *d3d9_surface_acquire_rendertarget_view(struct d3d9_surface *surface)
+{
+ HRESULT hr;
+
+ /* The surface reference count can be equal to 0 when this function is
+ * called. In order to properly manage the render target view reference
+ * count, we temporarily increment the surface reference count. */
+ d3d9_surface_AddRef(&surface->IDirect3DSurface9_iface);
+
+ if (surface->wined3d_rtv)
+ return surface->wined3d_rtv;
+
+ if (FAILED(hr = wined3d_rendertarget_view_create_from_sub_resource(surface->wined3d_texture,
+ surface->sub_resource_idx, surface, &d3d9_view_wined3d_parent_ops, &surface->wined3d_rtv)))
{
- case D3DFMT_A8R8G8B8:
- case D3DFMT_X8R8G8B8:
- case D3DFMT_R5G6B5:
- case D3DFMT_X1R5G5B5:
- case D3DFMT_A1R5G5B5:
- case D3DFMT_R8G8B8:
- surface->getdc_supported = TRUE;
- break;
-
- default:
- surface->getdc_supported = FALSE;
- break;
+ ERR("Failed to create rendertarget view, hr %#x.\n", hr);
+ d3d9_surface_Release(&surface->IDirect3DSurface9_iface);
+ return NULL;
}
- wined3d_surface_incref(wined3d_surface);
- surface->wined3d_surface = wined3d_surface;
- surface->parent_device = &device->IDirect3DDevice9Ex_iface;
- IDirect3DDevice9Ex_AddRef(surface->parent_device);
+ if (surface->texture)
+ list_add_head(&surface->texture->rtv_list, &surface->rtv_entry);
- *parent_ops = &d3d9_surface_wined3d_parent_ops;
+ return surface->wined3d_rtv;
+}
+
+void d3d9_surface_release_rendertarget_view(struct d3d9_surface *surface,
+ struct wined3d_rendertarget_view *rtv)
+{
+ if (rtv)
+ d3d9_surface_Release(&surface->IDirect3DSurface9_iface);
}
struct d3d9_surface *unsafe_impl_from_IDirect3DSurface9(IDirect3DSurface9 *iface)
projects / reactos.git / blobdiff