ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3d10core: Implement d3d10_texture3d_GetDevice().

This commit is contained in:
Henri Verbeet 2014-02-13 10:14:20 +01:00 committed by Alexandre Julliard
parent 387f65baf8
commit 6e3619c42b
3 changed files with 42 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/d3d10core/d3d10core_private.h
View File

@ -95,6 +95,7 @@ struct d3d10_texture3d
struct wined3d_texture *wined3d_texture;
D3D10_TEXTURE3D_DESC desc;
ID3D10Device1 *device;
};
HRESULT d3d10_texture3d_init(struct d3d10_texture3d *texture, struct d3d10_device *device,

24
dlls/d3d10core/tests/device.c
View File

@ -134,11 +134,11 @@ static void test_create_texture2d(void)
static void test_create_texture3d(void)
{
ULONG refcount, expected_refcount;
ID3D10Device *device, *tmp;
D3D10_TEXTURE3D_DESC desc;
ID3D10Texture3D *texture;
IDXGISurface *surface;
ID3D10Device *device;
ULONG refcount;
HRESULT hr;
if (!(device = create_device()))
@ -157,8 +157,18 @@ static void test_create_texture3d(void)
desc.CPUAccessFlags = 0;
desc.MiscFlags = 0;
expected_refcount = get_refcount((IUnknown *)device) + 1;
hr = ID3D10Device_CreateTexture3D(device, &desc, NULL, &texture);
ok(SUCCEEDED(hr), "Failed to create a 3d 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;
ID3D10Texture3D_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 = ID3D10Texture3D_QueryInterface(texture, &IID_IDXGISurface, (void **)&surface);
ok(FAILED(hr), "Texture should not implement IDXGISurface.\n");
@ -166,8 +176,18 @@ static void test_create_texture3d(void)
ID3D10Texture3D_Release(texture);
desc.MipLevels = 0;
expected_refcount = get_refcount((IUnknown *)device) + 1;
hr = ID3D10Device_CreateTexture3D(device, &desc, NULL, &texture);
ok(SUCCEEDED(hr), "Failed to create a 3d 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;
ID3D10Texture3D_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);
ID3D10Texture3D_GetDesc(texture, &desc);
ok(desc.Width == 64, "Got unexpected Width %u.\n", desc.Width);

20
dlls/d3d10core/texture.c
View File

@ -337,7 +337,10 @@ static ULONG STDMETHODCALLTYPE d3d10_texture3d_AddRef(ID3D10Texture3D *iface)
TRACE("%p increasing refcount to %u.\n", texture, refcount);
if (refcount == 1)
{
ID3D10Device1_AddRef(texture->device);
wined3d_texture_incref(texture->wined3d_texture);
}
return refcount;
}
@ -355,14 +358,26 @@ static ULONG STDMETHODCALLTYPE d3d10_texture3d_Release(ID3D10Texture3D *iface)
TRACE("%p decreasing refcount to %u.\n", texture, refcount);
if (!refcount)
{
ID3D10Device1 *device = texture->device;
wined3d_texture_decref(texture->wined3d_texture);
/* Release the device last, it may cause the wined3d device to be
* destroyed. */
ID3D10Device1_Release(device);
}
return refcount;
}
static void STDMETHODCALLTYPE d3d10_texture3d_GetDevice(ID3D10Texture3D *iface, ID3D10Device **device)
{
FIXME("iface %p, device %p stub!\n", iface, device);
struct d3d10_texture3d *texture = impl_from_ID3D10Texture3D(iface);
TRACE("iface %p, device %p.\n", iface, device);
*device = (ID3D10Device *)texture->device;
ID3D10Device_AddRef(*device);
}
static HRESULT STDMETHODCALLTYPE d3d10_texture3d_GetPrivateData(ID3D10Texture3D *iface,
@ -517,5 +532,8 @@ HRESULT d3d10_texture3d_init(struct d3d10_texture3d *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;
}