Commit 2843e4d3 authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard

d3d9: Disallow index buffers in the scratch pool.

parent 28324c5b
......@@ -572,6 +572,9 @@ HRESULT indexbuffer_init(struct d3d9_indexbuffer *buffer, struct d3d9_device *de
struct wined3d_buffer_desc desc;
HRESULT hr;
if (pool == D3DPOOL_SCRATCH)
return D3DERR_INVALIDCALL;
desc.byte_width = size;
desc.usage = (usage & WINED3DUSAGE_MASK) | WINED3DUSAGE_STATICDECL;
if (pool == D3DPOOL_SCRATCH)
......
......@@ -12967,7 +12967,7 @@ static void test_resource_access(void)
hr = IDirect3DDevice9_CreateIndexBuffer(device, 16, tests[i].usage,
tests[i].format == FORMAT_COLOUR ? D3DFMT_INDEX32 : D3DFMT_INDEX16, tests[i].pool, &ib, NULL);
todo_wine_if(tests[i].pool == D3DPOOL_SCRATCH || tests[i].usage & ~D3DUSAGE_DYNAMIC)
todo_wine_if(tests[i].pool != D3DPOOL_SCRATCH && tests[i].usage & ~D3DUSAGE_DYNAMIC)
ok(hr == (tests[i].pool == D3DPOOL_SCRATCH || (tests[i].usage & ~D3DUSAGE_DYNAMIC)
? D3DERR_INVALIDCALL : D3D_OK), "Test %u: Got unexpected hr %#x.\n", i, hr);
if (FAILED(hr))
......
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