Commit b4590d33 authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard

d3d9: Disallow creating managed vertex buffers on d3d9ex devices.

parent 5cc3b710
......@@ -283,6 +283,12 @@ HRESULT vertexbuffer_init(struct d3d9_vertexbuffer *buffer, struct d3d9_device *
return D3DERR_INVALIDCALL;
}
if (pool == D3DPOOL_MANAGED && device->d3d_parent->extended)
{
WARN("Managed resources are not supported by d3d9ex devices.\n");
return D3DERR_INVALIDCALL;
}
/* In d3d9, buffers can't be used as rendertarget or depth/stencil buffer. */
if (usage & (D3DUSAGE_RENDERTARGET | D3DUSAGE_DEPTHSTENCIL))
return D3DERR_INVALIDCALL;
......
......@@ -4533,10 +4533,9 @@ static void test_resource_access(void)
hr = IDirect3DDevice9Ex_CreateVertexBuffer(device, 16, tests[i].usage,
tests[i].format == FORMAT_COLOUR ? 0 : D3DFVF_XYZRHW, tests[i].pool, &vb, NULL);
todo_wine_if(hr == D3D_OK && tests[i].pool == D3DPOOL_MANAGED)
ok(hr == (tests[i].pool == D3DPOOL_SCRATCH || tests[i].pool == D3DPOOL_MANAGED
|| (tests[i].usage & ~D3DUSAGE_DYNAMIC) ? D3DERR_INVALIDCALL : D3D_OK),
"Test %u: Got unexpected hr %#x.\n", i, hr);
ok(hr == (tests[i].pool == D3DPOOL_SCRATCH || tests[i].pool == D3DPOOL_MANAGED
|| (tests[i].usage & ~D3DUSAGE_DYNAMIC) ? D3DERR_INVALIDCALL : D3D_OK),
"Test %u: Got unexpected hr %#x.\n", i, hr);
if (FAILED(hr))
continue;
......
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