Jason Green : d3d9: Fix a few ok() comparisons to not always return true in the visual tests.
Alexandre Julliard
julliard at winehq.org
Fri Mar 7 05:30:13 CST 2008
Module: wine
Branch: master
Commit: d0b8fd0a13f30bad1f6d8cb6f69bb564fb8bfa2d
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0b8fd0a13f30bad1f6d8cb6f69bb564fb8bfa2d
Author: Jason Green <jave27 at gmail.com>
Date: Thu Mar 6 10:59:47 2008 -0500
d3d9: Fix a few ok() comparisons to not always return true in the visual tests.
---
dlls/d3d9/tests/visual.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c
index a415525..67ec739 100644
--- a/dlls/d3d9/tests/visual.c
+++ b/dlls/d3d9/tests/visual.c
@@ -1077,11 +1077,11 @@ static void offscreen_test(IDirect3DDevice9 *device)
ok(hr == D3D_OK, "Clear failed, hr = %s\n", DXGetErrorString9(hr));
hr = IDirect3DDevice9_CreateTexture(device, 128, 128, 1, D3DUSAGE_RENDERTARGET, D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &offscreenTexture, NULL);
- ok(hr == D3D_OK || D3DERR_INVALIDCALL, "Creating the offscreen render target failed, hr = %s\n", DXGetErrorString9(hr));
+ ok(hr == D3D_OK || hr == D3DERR_INVALIDCALL, "Creating the offscreen render target failed, hr = %s\n", DXGetErrorString9(hr));
if(!offscreenTexture) {
trace("Failed to create an X8R8G8B8 offscreen texture, trying R5G6B5\n");
hr = IDirect3DDevice9_CreateTexture(device, 128, 128, 1, D3DUSAGE_RENDERTARGET, D3DFMT_R5G6B5, D3DPOOL_DEFAULT, &offscreenTexture, NULL);
- ok(hr == D3D_OK || D3DERR_INVALIDCALL, "Creating the offscreen render target failed, hr = %s\n", DXGetErrorString9(hr));
+ ok(hr == D3D_OK || hr == D3DERR_INVALIDCALL, "Creating the offscreen render target failed, hr = %s\n", DXGetErrorString9(hr));
if(!offscreenTexture) {
skip("Cannot create an offscreen render target\n");
goto out;
@@ -5547,7 +5547,7 @@ static void alpha_test(IDirect3DDevice9 *device)
ok(hr == D3D_OK, "Clear failed, hr = %08x\n", hr);
hr = IDirect3DDevice9_CreateTexture(device, 128, 128, 1, D3DUSAGE_RENDERTARGET, D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &offscreenTexture, NULL);
- ok(hr == D3D_OK || D3DERR_INVALIDCALL, "Creating the offscreen render target failed, hr = %#08x\n", hr);
+ ok(hr == D3D_OK || hr == D3DERR_INVALIDCALL, "Creating the offscreen render target failed, hr = %#08x\n", hr);
hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer);
ok(hr == D3D_OK, "Can't get back buffer, hr = %s\n", DXGetErrorString9(hr));
More information about the wine-cvs
mailing list