Module: wine Branch: master Commit: 7a4ed158840d7665a4e34aa29196cce5b0668842 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a4ed158840d7665a4e34aa291...
Author: Jörg Höhle hoehle@users.sourceforge.net Date: Mon Mar 2 09:11:59 2009 +0100
d3d9/tests: Fix typos in text.
---
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 4cb3497..cf589a5 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -8578,23 +8578,23 @@ static void pointsize_test(IDirect3DDevice9 *device)
/* ptsize = 16, ptsize_max = 1 --> point has size 1 */ color = getPixelColor(device, 448-4, 64-4); - ok(color == 0x000000ff, "pSize: Pixel (448-4),(64-4) has color 0x%08x, expected 0x00ffffff\n", color); + ok(color == 0x000000ff, "pSize: Pixel (448-4),(64-4) has color 0x%08x, expected 0x000000ff\n", color); color = getPixelColor(device, 448+4, 64+4); - ok(color == 0x000000ff, "pSize: Pixel (448+4),(64+4) has color 0x%08x, expected 0x00ffffff\n", color); + ok(color == 0x000000ff, "pSize: Pixel (448+4),(64+4) has color 0x%08x, expected 0x000000ff\n", color);
/* ptsize = 4, ptsize_max = 1, ptsize_min = 16 --> point has size 1 */ color = getPixelColor(device, 512-4, 64-4); - ok(color == 0x000000ff, "pSize: Pixel (448-4),(64-4) has color 0x%08x, expected 0x00ffffff\n", color); + ok(color == 0x000000ff, "pSize: Pixel (512-4),(64-4) has color 0x%08x, expected 0x000000ff\n", color); color = getPixelColor(device, 512+4, 64+4); - ok(color == 0x000000ff, "pSize: Pixel (448+4),(64+4) has color 0x%08x, expected 0x00ffffff\n", color); + ok(color == 0x000000ff, "pSize: Pixel (512+4),(64+4) has color 0x%08x, expected 0x000000ff\n", color);
/* ptsize = 1, ptsize_max = default(64), ptsize_min = 16 --> point has size 16 * Don't be overly picky - just show that the point is bigger than 1 pixel */ color = getPixelColor(device, 576-4, 64-4); - ok(color == 0x00ffffff, "pSize: Pixel (448-4),(64-4) has color 0x%08x, expected 0x00ffffff\n", color); + ok(color == 0x00ffffff, "pSize: Pixel (576-4),(64-4) has color 0x%08x, expected 0x00ffffff\n", color); color = getPixelColor(device, 576+4, 64+4); - ok(color == 0x00ffffff, "pSize: Pixel (448+4),(64+4) has color 0x%08x, expected 0x00ffffff\n", color); + ok(color == 0x00ffffff, "pSize: Pixel (576+4),(64+4) has color 0x%08x, expected 0x00ffffff\n", color);
hr = IDirect3DDevice9_SetRenderState(device, D3DRS_POINTSIZE, *((DWORD *) (&ptsize_orig))); ok(hr == D3D_OK, "IDirect3DDevice9_SetRenderState failed hr=%08x\n", hr); @@ -8878,7 +8878,7 @@ static void pixelshader_blending_test(IDirect3DDevice9 *device) b0 >= max(b1, 1) - 1 && b0 <= b1 + 1, "Offscreen failed for %s: Got color %#08x, expected %#08x.\n", test_formats[fmt_index].fmtName, color, test_formats[fmt_index].resultColorBlending); } else { - /* No pixel shader blending is supported so expected garbage.The type of 'garbage' depends on the driver version and OS. + /* No pixel shader blending is supported so expect garbage. The type of 'garbage' depends on the driver version and OS. * E.g. on G16R16 ati reports (on old r9600 drivers) 0x00ffffff and on modern ones 0x002010ff which is also what Nvidia * reports. On Vista Nvidia seems to report 0x00ffffff on Geforce7 cards. */ color = getPixelColor(device, 320, 240);