Module: wine Branch: master Commit: 9480e817198d7ca5f636e98cbb6f6632a852fc89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9480e817198d7ca5f636e98cbb...
Author: Matteo Bruni mbruni@codeweavers.com Date: Thu Sep 21 01:07:05 2017 +0200
d3d9/tests: Properly check for mipmap autogeneration support.
CheckDeviceFormat() returns D3DOK_NOAUTOGEN if the texture format is otherwise 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/device.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index fb30636..cb737e2 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -6801,7 +6801,7 @@ static void test_cube_texture_mipmap_gen(IDirect3DDevice9 *device) hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, D3DUSAGE_AUTOGENMIPMAP, D3DRTYPE_CUBETEXTURE, D3DFMT_X8R8G8B8); IDirect3D9_Release(d3d); - if (FAILED(hr)) + if (hr != D3D_OK) { skip("No cube mipmap generation support, skipping tests.\n"); return; @@ -6937,8 +6937,8 @@ static void test_mipmap_gen(void) d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n");
- if (FAILED(IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, - D3DUSAGE_AUTOGENMIPMAP, D3DRTYPE_TEXTURE, D3DFMT_X8R8G8B8))) + if (IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DUSAGE_AUTOGENMIPMAP, D3DRTYPE_TEXTURE, D3DFMT_X8R8G8B8) != D3D_OK) { skip("No mipmap generation support, skipping tests.\n"); IDirect3D9_Release(d3d);