marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3d9: Disallow creating managed 3D textures on d3d9ex devices. 

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
oldstable
Henri Verbeet 2018-11-22 15:03:08 +03:30 committed by Alexandre Julliard
parent d9db221f0d
commit 8d567bc9e2
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4459,10 +4459,9 @@ static void test_resource_access(void)
hr = IDirect3DDevice9Ex_CreateVolumeTexture(device, 16, 16, 1, 1,
tests[i].usage, format, tests[i].pool, &texture, NULL);
todo_wine_if(hr == D3D_OK && tests[i].pool == D3DPOOL_MANAGED)
ok(hr == (!(tests[i].usage & ~D3DUSAGE_DYNAMIC) && tests[i].pool != D3DPOOL_MANAGED
? D3D_OK : D3DERR_INVALIDCALL),
"Test %u: Got unexpected hr %#x.\n", i, hr);
ok(hr == (!(tests[i].usage & ~D3DUSAGE_DYNAMIC) && tests[i].pool != D3DPOOL_MANAGED
? D3D_OK : D3DERR_INVALIDCALL),
"Test %u: Got unexpected hr %#x.\n", i, hr);
if (FAILED(hr))
continue;

6
dlls/d3d9/texture.c
View File

@ -1451,6 +1451,12 @@ HRESULT volumetexture_init(struct d3d9_texture *texture, struct d3d9_device *dev
struct wined3d_resource_desc desc;
HRESULT hr;
if (pool == D3DPOOL_MANAGED && device->d3d_parent->extended)
{
WARN("Managed resources are not supported by d3d9ex devices.\n");
return D3DERR_INVALIDCALL;
}
/* In d3d9, 3D textures can't be used as rendertarget or depth/stencil buffer. */
if (usage & (D3DUSAGE_RENDERTARGET | D3DUSAGE_DEPTHSTENCIL))
return D3DERR_INVALIDCALL;