Paul Vriens : d3d8/tests: Fix some tests (logical || with non-zero constant ).
Alexandre Julliard
julliard at winehq.org
Fri Jun 19 08:27:13 CDT 2009
Module: wine
Branch: master
Commit: 91e306579bbc51b6f86b97ab99704d3f398dadcd
URL: http://source.winehq.org/git/wine.git/?a=commit;h=91e306579bbc51b6f86b97ab99704d3f398dadcd
Author: Paul Vriens <Paul.Vriens.Wine at gmail.com>
Date: Fri Jun 19 08:14:17 2009 +0200
d3d8/tests: Fix some tests (logical || with non-zero constant).
---
dlls/d3d8/tests/visual.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c
index 19bf497..1850b83 100644
--- a/dlls/d3d8/tests/visual.c
+++ b/dlls/d3d8/tests/visual.c
@@ -645,11 +645,11 @@ static void offscreen_test(IDirect3DDevice8 *device)
ok(hr == D3D_OK, "Clear failed, hr = %#08x\n", hr);
hr = IDirect3DDevice8_CreateTexture(device, 128, 128, 1, D3DUSAGE_RENDERTARGET, D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &offscreenTexture);
- 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);
if(!offscreenTexture) {
trace("Failed to create an X8R8G8B8 offscreen texture, trying R5G6B5\n");
hr = IDirect3DDevice8_CreateTexture(device, 128, 128, 1, D3DUSAGE_RENDERTARGET, D3DFMT_R5G6B5, D3DPOOL_DEFAULT, &offscreenTexture);
- 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);
if(!offscreenTexture) {
skip("Cannot create an offscreen render target\n");
goto out;
@@ -776,7 +776,7 @@ static void alpha_test(IDirect3DDevice8 *device)
ok(hr == D3D_OK, "Clear failed, hr = %08x\n", hr);
hr = IDirect3DDevice8_CreateTexture(device, 128, 128, 1, D3DUSAGE_RENDERTARGET, D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &offscreenTexture);
- 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 = IDirect3DDevice8_GetDepthStencilSurface(device, &depthstencil);
ok(hr == D3D_OK, "IDirect3DDevice8_GetDepthStencilSurface failed, hr = %#08x\n", hr);
More information about the wine-cvs
mailing list