mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-05 23:20:43 +00:00
d3d9: Disallow rendertarget and depth/stencil usage on 3D textures.
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
fc97073e2a
commit
c3c98ed4a9
|
@ -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;
|
||||
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue