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

d3d9/tests: Test user memory with D3DPOOL_SCRATCH.

parent b0f177b6
...@@ -747,8 +747,15 @@ static HRESULT WINAPI d3d9_device_CreateTexture(IDirect3DDevice9Ex *iface, ...@@ -747,8 +747,15 @@ static HRESULT WINAPI d3d9_device_CreateTexture(IDirect3DDevice9Ex *iface,
set_mem = TRUE; set_mem = TRUE;
} }
else 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); FIXME("Resource sharing not implemented, *shared_handle %p.\n", *shared_handle);
} }
}
object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object));
if (!object) if (!object)
......
...@@ -535,7 +535,7 @@ out: ...@@ -535,7 +535,7 @@ out:
IDirect3D9Ex_Release(d3d9ex); IDirect3D9Ex_Release(d3d9ex);
} }
static void test_texture_sysmem_create(void) static void test_user_memory(void)
{ {
IDirect3DDevice9Ex *device; IDirect3DDevice9Ex *device;
IDirect3DTexture9 *texture; IDirect3DTexture9 *texture;
...@@ -562,6 +562,9 @@ static void test_texture_sysmem_create(void) ...@@ -562,6 +562,9 @@ static void test_texture_sysmem_create(void)
hr = IDirect3DDevice9Ex_CreateTexture(device, 128, 128, 2, 0, D3DFMT_A8R8G8B8, hr = IDirect3DDevice9Ex_CreateTexture(device, 128, 128, 2, 0, D3DFMT_A8R8G8B8,
D3DPOOL_SYSTEMMEM, &texture, &mem); D3DPOOL_SYSTEMMEM, &texture, &mem);
ok(hr == D3DERR_INVALIDCALL, "Got unexpected hr %#x.\n", hr); 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, hr = IDirect3DDevice9Ex_CreateTexture(device, 128, 128, 1, 0, D3DFMT_A8R8G8B8,
D3DPOOL_SYSTEMMEM, &texture, &mem); D3DPOOL_SYSTEMMEM, &texture, &mem);
...@@ -1114,7 +1117,7 @@ START_TEST(d3d9ex) ...@@ -1114,7 +1117,7 @@ START_TEST(d3d9ex)
test_swapchain_get_displaymode_ex(); test_swapchain_get_displaymode_ex();
test_get_adapter_luid(); test_get_adapter_luid();
test_get_adapter_displaymode_ex(); test_get_adapter_displaymode_ex();
test_texture_sysmem_create(); test_user_memory();
test_reset(); test_reset();
test_reset_resources(); test_reset_resources();
test_vidmem_accounting(); test_vidmem_accounting();
......
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