Module: wine Branch: master Commit: 8d567bc9e2984b6a57de4fab20f2ff4d1b982066 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d567bc9e2984b6a57de4fab2...
Author: Henri Verbeet hverbeet@codeweavers.com Date: Thu Nov 22 15:21:08 2018 +0330
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
---
dlls/d3d9/tests/d3d9ex.c | 7 +++---- dlls/d3d9/texture.c | 6 ++++++ 2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 2a3adc7..5387296 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -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;
diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 84a1bd8..456e41e 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -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;