Module: wine Branch: master Commit: 7ea7680966502c13e89ddf64a3ec13ea2b161a71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7ea7680966502c13e89ddf64a3...
Author: Matteo Bruni mbruni@codeweavers.com Date: Fri Mar 10 00:32:00 2017 +0100
d3d9/tests: Skip UpdateTexture tests if texture filtering isn't supported.
Signed-off-by: Matteo Bruni mbruni@codeweavers.com Signed-off-by: Henri Verbeet hverbeet@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/d3d9/tests/visual.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 41a883d..a615596 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -19772,9 +19772,15 @@ static void test_updatetexture(void) skip("%s textures not supported, skipping some tests.\n", texture_types[t].name); continue; } - if (FAILED(IDirect3D9_CheckDeviceFormat(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, - D3DFMT_X8R8G8B8, 0, texture_types[t].type, MAKEFOURCC('A','T','I','2')))) + D3DFMT_X8R8G8B8, D3DUSAGE_QUERY_FILTER, texture_types[t].type, D3DFMT_A8R8G8B8))) + { + skip("%s D3DFMT_A8R8G8B8 texture filtering is not supported, skipping some tests.\n", + texture_types[t].name); + continue; + } + if (FAILED(IDirect3D9_CheckDeviceFormat(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_X8R8G8B8, D3DUSAGE_QUERY_FILTER, texture_types[t].type, MAKEFOURCC('A','T','I','2')))) { skip("%s ATI2N textures are not supported, skipping some tests.\n", texture_types[t].name); ati2n_supported = FALSE;