Matteo Bruni : d3dx9/tests: Mark a test todo_wine when DXTn textures aren' t supported by the GL driver.
Alexandre Julliard
julliard at winehq.org
Thu Mar 13 14:40:35 CDT 2014
Module: wine
Branch: master
Commit: 9295ee0c0b47f4b67e7268041008e1d12eff72c4
URL: http://source.winehq.org/git/wine.git/?a=commit;h=9295ee0c0b47f4b67e7268041008e1d12eff72c4
Author: Matteo Bruni <mbruni at codeweavers.com>
Date: Thu Mar 13 16:31:09 2014 +0100
d3dx9/tests: Mark a test todo_wine when DXTn textures aren't supported by the GL driver.
---
dlls/d3dx9_36/tests/texture.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/dlls/d3dx9_36/tests/texture.c b/dlls/d3dx9_36/tests/texture.c
index 1a85d15..16cb0e5 100644
--- a/dlls/d3dx9_36/tests/texture.c
+++ b/dlls/d3dx9_36/tests/texture.c
@@ -1637,7 +1637,10 @@ static void test_D3DXCreateVolumeTextureFromFileInMemory(IDirect3DDevice9 *devic
ok(hr == D3DERR_INVALIDCALL, "D3DXCreateVolumeTextureFromFileInMemory returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL);
hr = D3DXCreateVolumeTextureFromFileInMemory(device, dds_volume_map, sizeof(dds_volume_map), &volume_texture);
- ok(hr == D3D_OK, "D3DXCreateVolumeTextureFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK);
+ if (has_2d_dxt3)
+ ok(hr == D3D_OK, "D3DXCreateVolumeTextureFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK);
+ else
+ todo_wine ok(hr == D3D_OK, "D3DXCreateVolumeTextureFromFileInMemory returned %#x, expected %#x\n", hr, D3D_OK);
if (SUCCEEDED(hr))
{
levelcount = IDirect3DVolumeTexture9_GetLevelCount(volume_texture);
More information about the wine-cvs
mailing list