system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-05 18:01:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

d3d9/tests: Test user memory with D3DPOOL_SCRATCH.

Browse source
This commit is contained in:
Stefan Dösinger 2013-12-10 14:36:55 +01:00 committed by Alexandre Julliard
parent b0f177b619
commit b7b0b7d2e1
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
dlls/d3d9/device.c
View file

@ -747,8 +747,15 @@ static HRESULT WINAPI d3d9_device_CreateTexture(IDirect3DDevice9Ex *iface,
set_mem = TRUE;
}
else
{
if (pool != D3DPOOL_DEFAULT)
{
WARN("Trying to create a shared texture in pool %#x.\n", pool);
return D3DERR_INVALIDCALL;
}
FIXME("Resource sharing not implemented, *shared_handle %p.\n", *shared_handle);
}
}
object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object));
if (!object)

7
dlls/d3d9/tests/d3d9ex.c
View file

@ -535,7 +535,7 @@ out:
IDirect3D9Ex_Release(d3d9ex);
}
static void test_texture_sysmem_create(void)
static void test_user_memory(void)
{
IDirect3DDevice9Ex *device;
IDirect3DTexture9 *texture;
@ -562,6 +562,9 @@ static void test_texture_sysmem_create(void)
hr = IDirect3DDevice9Ex_CreateTexture(device, 128, 128, 2, 0, D3DFMT_A8R8G8B8,
D3DPOOL_SYSTEMMEM, &texture, &mem);
ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr);
hr = IDirect3DDevice9Ex_CreateTexture(device, 128, 128, 1, 0, D3DFMT_A8R8G8B8,
D3DPOOL_SCRATCH, &texture, &mem);
ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr);
hr = IDirect3DDevice9Ex_CreateTexture(device, 128, 128, 1, 0, D3DFMT_A8R8G8B8,
D3DPOOL_SYSTEMMEM, &texture, &mem);
@ -1114,7 +1117,7 @@ START_TEST(d3d9ex)
test_swapchain_get_displaymode_ex();
test_get_adapter_luid();
test_get_adapter_displaymode_ex();
test_texture_sysmem_create();
test_user_memory();
test_reset();
test_reset_resources();
test_vidmem_accounting();