[PATCH 5/5] d3d9: Disallow creating managed 3D textures on d3d9ex devices.
Henri Verbeet
hverbeet at codeweavers.com
Thu Nov 22 05:33:08 CST 2018
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
---
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 2a3adc7b53b..538729672b5 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 84a1bd85e78..456e41e82e2 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;
--
2.11.0
More information about the wine-devel
mailing list