Module: wine Branch: master Commit: 387f65baf8dc01882bc2941dec95a1748feab7e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=387f65baf8dc01882bc2941dec...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Thu Feb 13 10:14:19 2014 +0100
d3d10core: Implement d3d10_texture2d_GetDevice().
---
dlls/d3d10core/d3d10core_private.h | 1 + dlls/d3d10core/tests/device.c | 30 ++++++++++++++++++++++++++++-- dlls/d3d10core/texture.c | 20 +++++++++++++++++++- dlls/dxgi/surface.c | 4 ---- 4 files changed, 48 insertions(+), 7 deletions(-)
diff --git a/dlls/d3d10core/d3d10core_private.h b/dlls/d3d10core/d3d10core_private.h index 62392e5..291481e 100644 --- a/dlls/d3d10core/d3d10core_private.h +++ b/dlls/d3d10core/d3d10core_private.h @@ -81,6 +81,7 @@ struct d3d10_texture2d IUnknown *dxgi_surface; struct wined3d_texture *wined3d_texture; D3D10_TEXTURE2D_DESC desc; + ID3D10Device1 *device; };
HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d10_device *device, diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 213987b..0abacd7 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -21,6 +21,12 @@ #include "d3d10.h" #include "wine/test.h"
+static ULONG get_refcount(IUnknown *iface) +{ + IUnknown_AddRef(iface); + return IUnknown_Release(iface); +} + static ID3D10Device *create_device(void) { ID3D10Device *device; @@ -37,11 +43,11 @@ static ID3D10Device *create_device(void)
static void test_create_texture2d(void) { + ULONG refcount, expected_refcount; + ID3D10Device *device, *tmp; D3D10_TEXTURE2D_DESC desc; ID3D10Texture2D *texture; IDXGISurface *surface; - ID3D10Device *device; - ULONG refcount; HRESULT hr;
if (!(device = create_device())) @@ -62,8 +68,18 @@ static void test_create_texture2d(void) desc.CPUAccessFlags = 0; desc.MiscFlags = 0;
+ expected_refcount = get_refcount((IUnknown *)device) + 1; hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, &texture); ok(SUCCEEDED(hr), "Failed to create a 2d texture, hr %#x\n", hr); + refcount = get_refcount((IUnknown *)device); + ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount); + tmp = NULL; + expected_refcount = refcount + 1; + ID3D10Texture2D_GetDevice(texture, &tmp); + ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device); + refcount = get_refcount((IUnknown *)device); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + ID3D10Device_Release(tmp);
hr = ID3D10Texture2D_QueryInterface(texture, &IID_IDXGISurface, (void **)&surface); ok(SUCCEEDED(hr), "Texture should implement IDXGISurface\n"); @@ -71,8 +87,18 @@ static void test_create_texture2d(void) ID3D10Texture2D_Release(texture);
desc.MipLevels = 0; + expected_refcount = get_refcount((IUnknown *)device) + 1; hr = ID3D10Device_CreateTexture2D(device, &desc, NULL, &texture); ok(SUCCEEDED(hr), "Failed to create a 2d texture, hr %#x\n", hr); + refcount = get_refcount((IUnknown *)device); + ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount); + tmp = NULL; + expected_refcount = refcount + 1; + ID3D10Texture2D_GetDevice(texture, &tmp); + ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device); + refcount = get_refcount((IUnknown *)device); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + ID3D10Device_Release(tmp);
ID3D10Texture2D_GetDesc(texture, &desc); ok(desc.Width == 512, "Got unexpected Width %u.\n", desc.Width); diff --git a/dlls/d3d10core/texture.c b/dlls/d3d10core/texture.c index d3ffcb1..bd1022d 100644 --- a/dlls/d3d10core/texture.c +++ b/dlls/d3d10core/texture.c @@ -67,7 +67,10 @@ static ULONG STDMETHODCALLTYPE d3d10_texture2d_AddRef(ID3D10Texture2D *iface) TRACE("%p increasing refcount to %u\n", This, refcount);
if (refcount == 1) + { + ID3D10Device1_AddRef(This->device); wined3d_texture_incref(This->wined3d_texture); + }
return refcount; } @@ -88,7 +91,14 @@ static ULONG STDMETHODCALLTYPE d3d10_texture2d_Release(ID3D10Texture2D *iface) TRACE("%p decreasing refcount to %u\n", This, refcount);
if (!refcount) + { + ID3D10Device1 *device = This->device; + wined3d_texture_decref(This->wined3d_texture); + /* Release the device last, it may cause the wined3d device to be + * destroyed. */ + ID3D10Device1_Release(device); + }
return refcount; } @@ -97,7 +107,12 @@ static ULONG STDMETHODCALLTYPE d3d10_texture2d_Release(ID3D10Texture2D *iface)
static void STDMETHODCALLTYPE d3d10_texture2d_GetDevice(ID3D10Texture2D *iface, ID3D10Device **device) { - FIXME("iface %p, device %p stub!\n", iface, device); + struct d3d10_texture2d *texture = impl_from_ID3D10Texture2D(iface); + + TRACE("iface %p, device %p.\n", iface, device); + + *device = (ID3D10Device *)texture->device; + ID3D10Device_AddRef(*device); }
static HRESULT STDMETHODCALLTYPE d3d10_texture2d_GetPrivateData(ID3D10Texture2D *iface, @@ -283,6 +298,9 @@ HRESULT d3d10_texture2d_init(struct d3d10_texture2d *texture, struct d3d10_devic } texture->desc.MipLevels = wined3d_texture_get_level_count(texture->wined3d_texture);
+ texture->device = &device->ID3D10Device1_iface; + ID3D10Device1_AddRef(texture->device); + return S_OK; }
diff --git a/dlls/dxgi/surface.c b/dlls/dxgi/surface.c index f7fa931..2814742 100644 --- a/dlls/dxgi/surface.c +++ b/dlls/dxgi/surface.c @@ -71,10 +71,7 @@ static ULONG STDMETHODCALLTYPE dxgi_surface_inner_Release(IUnknown *iface) TRACE("%p decreasing refcount to %u.\n", surface, refcount);
if (!refcount) - { - IDXGIDevice_Release(surface->device); HeapFree(GetProcessHeap(), 0, surface); - }
return refcount; } @@ -210,7 +207,6 @@ HRESULT dxgi_surface_init(struct dxgi_surface *surface, IDXGIDevice *device, IUn surface->refcount = 1; surface->outer_unknown = outer ? outer : &surface->IUnknown_iface; surface->device = device; - IDXGIDevice_AddRef(device);
return S_OK; }
-
Alexandre Julliard