Henri Verbeet : d3d9: Disallow rendertarget and depth/ stencil usage on 3D textures.
Alexandre Julliard
julliard at winehq.org
Tue Nov 20 15:39:50 CST 2018
Module: wine
Branch: master
Commit: c3c98ed4a9abf01573d91ddeef65d71c34d682b1
URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3c98ed4a9abf01573d91ddeef65d71c34d682b1
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Tue Nov 20 16:54:44 2018 +0330
d3d9: Disallow rendertarget and depth/stencil usage on 3D textures.
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/d3d9/tests/device.c | 6 ++----
dlls/d3d9/texture.c | 4 ++++
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c
index d0e5660..af0e8a0 100644
--- a/dlls/d3d9/tests/device.c
+++ b/dlls/d3d9/tests/device.c
@@ -12926,10 +12926,8 @@ static void test_resource_access(void)
hr = IDirect3DDevice9_CreateVolumeTexture(device, 16, 16, 1, 1,
tests[i].usage, format, tests[i].pool, &texture, NULL);
- todo_wine_if(tests[i].usage & D3DUSAGE_RENDERTARGET
- && !(tests[i].usage & D3DUSAGE_DYNAMIC) && tests[i].pool == D3DPOOL_DEFAULT)
- ok(hr == (!(tests[i].usage & ~D3DUSAGE_DYNAMIC) ? D3D_OK : D3DERR_INVALIDCALL),
- "Test %u: Got unexpected hr %#x.\n", i, hr);
+ ok(hr == (!(tests[i].usage & ~D3DUSAGE_DYNAMIC) ? 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 4855985..e652416 100644
--- a/dlls/d3d9/texture.c
+++ b/dlls/d3d9/texture.c
@@ -1453,6 +1453,10 @@ HRESULT volumetexture_init(struct d3d9_texture *texture, struct d3d9_device *dev
struct wined3d_resource_desc desc;
HRESULT hr;
+ /* In d3d9, 3D textures can't be used as rendertarget or depth/stencil buffer. */
+ if (usage & (D3DUSAGE_RENDERTARGET | D3DUSAGE_DEPTHSTENCIL))
+ return D3DERR_INVALIDCALL;
+
texture->IDirect3DBaseTexture9_iface.lpVtbl = (const IDirect3DBaseTexture9Vtbl *)&d3d9_texture_3d_vtbl;
d3d9_resource_init(&texture->resource);
list_init(&texture->rtv_list);
More information about the wine-cvs
mailing list