Module: wine Branch: master Commit: 9a790806bdfe6873de2af9c0a68271fcde093956 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a790806bdfe6873de2af9c0a6...
Author: Matteo Bruni mbruni@codeweavers.com Date: Fri Jul 22 20:01:25 2011 +0200
d3d9/tests: Fix some messages.
---
dlls/d3d9/tests/visual.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 761a385..7651069 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -940,19 +940,19 @@ static void fog_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGENABLE, TRUE); ok(hr == D3D_OK, "Turning on fog calculations returned %08x\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGCOLOR, 0xFF00FF00 /* A nice green */); - ok(hr == D3D_OK, "Turning on fog calculations returned %08x\n", hr); + ok(hr == D3D_OK, "Setting fog color returned %#08x\n", hr);
/* First test: Both table fog and vertex fog off */ hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGTABLEMODE, D3DFOG_NONE); ok(hr == D3D_OK, "Turning off table fog returned %08x\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGVERTEXMODE, D3DFOG_NONE); - ok(hr == D3D_OK, "Turning off table fog returned %08x\n", hr); + ok(hr == D3D_OK, "Turning off vertex fog returned %08x\n", hr);
/* Start = 0, end = 1. Should be default, but set them */ hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGSTART, *((DWORD *) &start)); ok(hr == D3D_OK, "Setting fog start returned %08x\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGEND, *((DWORD *) &end)); - ok(hr == D3D_OK, "Setting fog start returned %08x\n", hr); + ok(hr == D3D_OK, "Setting fog end returned %08x\n", hr);
if(IDirect3DDevice9_BeginScene(device) == D3D_OK) { @@ -966,7 +966,7 @@ static void fog_test(IDirect3DDevice9 *device)
/* That makes it use the Z value */ hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGVERTEXMODE, D3DFOG_LINEAR); - ok(hr == D3D_OK, "Turning off table fog returned %08x\n", hr); + ok(hr == D3D_OK, "Setting fog vertex mode to D3DFOG_LINEAR returned %#08x\n", hr); /* Untransformed, vertex fog != none (or table fog != none): * Use the Z value as input into the equation */ @@ -1035,12 +1035,12 @@ static void fog_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGSTART, *((DWORD *) &start)); ok(hr == D3D_OK, "Setting fog start returned %08x\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGEND, *((DWORD *) &end)); - ok(hr == D3D_OK, "Setting fog start returned %08x\n", hr); + ok(hr == D3D_OK, "Setting fog end returned %08x\n", hr);
hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_SPECULAR); ok( hr == D3D_OK, "SetFVF returned %08x\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGVERTEXMODE, D3DFOG_LINEAR); - ok( hr == D3D_OK, "IDirect3DDevice9_SetRenderState %08x\n", hr); + ok( hr == D3D_OK, "Setting fog vertex mode to D3DFOG_LINEAR returned %08x\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGTABLEMODE, D3DFOG_NONE); ok( hr == D3D_OK, "Setting fog table mode to D3DFOG_LINEAR returned %08x\n", hr);
@@ -1154,7 +1154,7 @@ static void fog_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGEND, *((DWORD *) &end)); ok(hr == D3D_OK, "Setting fog end returned %08x\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGVERTEXMODE, D3DFOG_LINEAR); - ok( hr == D3D_OK, "IDirect3DDevice9_SetRenderState %08x\n", hr); + ok( hr == D3D_OK, "Setting fog vertex mode to D3DFOG_LINEAR returned %08x\n", hr); hr = IDirect3DDevice9_SetRenderState(device, D3DRS_FOGTABLEMODE, D3DFOG_LINEAR); ok( hr == D3D_OK, "Setting fog table mode to D3DFOG_LINEAR returned %08x\n", hr); }