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

d3d9: Disallow rendertarget and depth/stencil usage on index buffers. 

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet 2018-11-21 16:47:25 +03:30 committed by Alexandre Julliard
parent b9d50242a6
commit d496876122
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/d3d9/buffer.c
View File

@ -579,6 +579,10 @@ HRESULT indexbuffer_init(struct d3d9_indexbuffer *buffer, struct d3d9_device *de
if (pool == D3DPOOL_SCRATCH) if (pool == D3DPOOL_SCRATCH)
return D3DERR_INVALIDCALL; 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;
desc.byte_width = size; desc.byte_width = size;
desc.usage = (usage & WINED3DUSAGE_MASK) | WINED3DUSAGE_STATICDECL; desc.usage = (usage & WINED3DUSAGE_MASK) | WINED3DUSAGE_STATICDECL;
if (pool == D3DPOOL_SCRATCH) if (pool == D3DPOOL_SCRATCH)

8
dlls/d3d9/tests/device.c
View File

@ -12965,16 +12965,14 @@ static void test_resource_access(void)
hr = IDirect3DDevice9_CreateIndexBuffer(device, 16, tests[i].usage, hr = IDirect3DDevice9_CreateIndexBuffer(device, 16, tests[i].usage,
tests[i].format == FORMAT_COLOUR ? D3DFMT_INDEX32 : D3DFMT_INDEX16, tests[i].pool, &ib, NULL); 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) ok(hr == (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);
? D3DERR_INVALIDCALL : D3D_OK), "Test %u: Got unexpected hr %#x.\n", i, hr);
if (FAILED(hr)) if (FAILED(hr))
continue; continue;
hr = IDirect3DIndexBuffer9_GetDesc(ib, &ib_desc); hr = IDirect3DIndexBuffer9_GetDesc(ib, &ib_desc);
ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);
todo_wine_if(tests[i].usage & ~D3DUSAGE_DYNAMIC) ok(ib_desc.Usage == tests[i].usage, "Test %u: Got unexpected usage %#x.\n", i, ib_desc.Usage);
ok(ib_desc.Usage == tests[i].usage, "Test %u: Got unexpected usage %#x.\n", i, ib_desc.Usage);
ok(ib_desc.Pool == tests[i].pool, "Test %u: Got unexpected pool %#x.\n", i, ib_desc.Pool); ok(ib_desc.Pool == tests[i].pool, "Test %u: Got unexpected pool %#x.\n", i, ib_desc.Pool);
hr = IDirect3DIndexBuffer9_Lock(ib, 0, 0, &data, 0); hr = IDirect3DIndexBuffer9_Lock(ib, 0, 0, &data, 0);