Henri Verbeet : d3d9: Disallow creating managed 2D textures on d3d9ex devices.
Alexandre Julliard
julliard at winehq.org
Fri Nov 23 14:18:03 CST 2018
Module: wine
Branch: master
Commit: d511b67da3a0fc4869c2ddfd7a5308f9de107655
URL: https://source.winehq.org/git/wine.git/?a=commit;h=d511b67da3a0fc4869c2ddfd7a5308f9de107655
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Fri Nov 23 19:18:45 2018 +0330
d3d9: Disallow creating managed 2D textures on d3d9ex devices.
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/d3d9/tests/d3d9ex.c | 4 ++--
dlls/d3d9/texture.c | 6 ++++++
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c
index 6601c94..82acaf4 100644
--- a/dlls/d3d9/tests/d3d9ex.c
+++ b/dlls/d3d9/tests/d3d9ex.c
@@ -4273,8 +4273,8 @@ static void test_resource_access(void)
case SURFACE_2D:
hr = IDirect3DDevice9Ex_CreateTexture(device, 16, 16, 1,
tests[j].usage, format, tests[j].pool, &texture_2d, NULL);
- todo_wine_if(!tests[j].valid && !tests[j].usage && (tests[j].format == FORMAT_DEPTH
- || tests[j].pool == D3DPOOL_MANAGED))
+ todo_wine_if(!tests[j].valid && tests[j].format == FORMAT_DEPTH
+ && !tests[j].usage && tests[j].pool != D3DPOOL_MANAGED)
ok(hr == (tests[j].valid && (tests[j].format != FORMAT_DEPTH || depth_2d)
? D3D_OK : D3DERR_INVALIDCALL),
"Test %s %u: Got unexpected hr %#x.\n", surface_types[i].name, j, hr);
diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c
index 0c58519..c73cbc0 100644
--- a/dlls/d3d9/texture.c
+++ b/dlls/d3d9/texture.c
@@ -1301,6 +1301,12 @@ HRESULT texture_init(struct d3d9_texture *texture, struct d3d9_device *device,
DWORD flags = 0;
HRESULT hr;
+ if (pool == D3DPOOL_MANAGED && device->d3d_parent->extended)
+ {
+ WARN("Managed resources are not supported by d3d9ex devices.\n");
+ return D3DERR_INVALIDCALL;
+ }
+
texture->IDirect3DBaseTexture9_iface.lpVtbl = (const IDirect3DBaseTexture9Vtbl *)&d3d9_texture_2d_vtbl;
d3d9_resource_init(&texture->resource);
list_init(&texture->rtv_list);
More information about the wine-cvs
mailing list