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

d3d9: Disallow creating managed vertex buffers on d3d9ex devices. 

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-22 15:03:06 +03:30 committed by Alexandre Julliard
parent 5cc3b710c8
commit b4590d3368
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/d3d9/buffer.c
View File

@ -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;

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

@ -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;