Signed-off-by: Stefan Dösinger stefan@codeweavers.com
---
d3d9 and earlier cards fail this test (tested on r500 and by Matteo on a gf4go, aka gf2). Since applications using ddraw.dll are unlikely to depend on the higher precision of d3d10+ cards, unconditionally increase the added offsets in the test.
As far as my hardware is concerned we can now remove the todo_wine in this test because the offset we add for the "nudge" primitives is larger than the offset wined3d adds for correcting the filling convention. I'll wait for Matteo's word on the geforce 4 though. --- dlls/ddraw/tests/ddraw1.c | 6 ++++-- dlls/ddraw/tests/ddraw2.c | 6 ++++-- dlls/ddraw/tests/ddraw4.c | 6 ++++-- dlls/ddraw/tests/ddraw7.c | 6 ++++-- 4 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 11c14777122..efbecf04c2d 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -14513,8 +14513,10 @@ static void test_filling_convention(void) D3DRECT clear_rect = {{0}, {0}, {vp_size}, {vp_size}};
/* This test data follows the examples in MSDN's - * "Rasterization Rules (Direct3D 9)" article. */ - static const float eps = 1.0f / 512.0f; + * "Rasterization Rules (Direct3D 9)" article. + * + * See the d3d9 test for a comment about the eps value. */ + static const float eps = 1.0f / 64.0f; D3DLVERTEX center_tris[] = { /* left */ diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 33ad957b644..65ac21d73ad 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -15443,8 +15443,10 @@ static void test_filling_convention(void) D3DRECT clear_rect = {{0}, {0}, {vp_size}, {vp_size}};
/* This test data follows the examples in MSDN's - * "Rasterization Rules (Direct3D 9)" article. */ - static const float eps = 1.0f / 512.0f; + * "Rasterization Rules (Direct3D 9)" article. + * + * See the d3d9 test for a comment about the eps value. */ + static const float eps = 1.0f / 64.0f; D3DLVERTEX center_tris[] = { /* left */ diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 61828430331..ce2333d93f0 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -18493,8 +18493,10 @@ static void test_filling_convention(void) D3DRECT clear_rect = {{0}, {0}, {vp_size}, {vp_size}};
/* This test data follows the examples in MSDN's - * "Rasterization Rules (Direct3D 9)" article. */ - static const float eps = 1.0f / 512.0f; + * "Rasterization Rules (Direct3D 9)" article. + * + * See the d3d9 test for a comment about the eps value. */ + static const float eps = 1.0f / 64.0f; struct { struct vec3 position; diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index fc0f854e125..4cf57bfcfd3 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -18745,8 +18745,10 @@ static void test_filling_convention(void) D3DVIEWPORT7 vp = { 0, 0, vp_size, vp_size, 0.0, 1.0 };
/* This test data follows the examples in MSDN's - * "Rasterization Rules (Direct3D 9)" article. */ - static const float eps = 1.0f / 512.0f; + * "Rasterization Rules (Direct3D 9)" article. + * + * See the d3d9 test for a comment about the eps value. */ + static const float eps = 1.0f / 64.0f; struct { struct vec3 position;
Signed-off-by: Stefan Dösinger stefan@codeweavers.com --- dlls/d3d8/tests/visual.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 29baf07398c..3c61426e17f 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -11330,8 +11330,10 @@ static void test_filling_convention(void) };
/* This test data follows the examples in MSDN's - * "Rasterization Rules (Direct3D 9)" article. */ - static const float eps = 1.0f / 512.0f; + * "Rasterization Rules (Direct3D 9)" article. + * + * See the d3d9 test for a comment about the eps value. */ + static const float eps = 1.0f / 64.0f; const struct { struct vec3 position;
Signed-off-by: Henri Verbeet hverbeet@codeweavers.com
Signed-off-by: Stefan Dösinger stefan@codeweavers.com --- dlls/d3d9/tests/visual.c | 45 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 42 insertions(+), 3 deletions(-)
diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index eb31f877acd..f4aa45f91fa 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -117,6 +117,19 @@ static BOOL adapter_is_amd(const D3DADAPTER_IDENTIFIER9 *identifier) return adapter_is_vendor(identifier, 0x1002); }
+static BOOL device_is_d3d10(IDirect3DDevice9 *device) +{ + IDirect3D9 *d3d; + HRESULT hr; + + IDirect3DDevice9_GetDirect3D(device, &d3d); + hr = IDirect3D9_CheckDeviceFormat(d3d, 0, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DUSAGE_QUERY_FILTER, D3DRTYPE_TEXTURE, D3DFMT_A32B32G32R32F); + IDirect3D9_Release(d3d); + + return SUCCEEDED(hr); +} + /* Locks a given surface and returns the color at (x,y). It's the caller's * responsibility to only pass in lockable surfaces and valid x,y coordinates */ static DWORD getPixelColorFromSurface(IDirect3DSurface9 *surface, UINT x, UINT y) @@ -27052,9 +27065,22 @@ static void test_filling_convention(void) };
/* This test data follows the examples in MSDN's - * "Rasterization Rules (Direct3D 9)" article. */ - static const float eps = 1.0f / 512.0f; - const struct + * "Rasterization Rules (Direct3D 9)" article. + * + * The eps offset is filled in later depending on the GPU generation. The -eps/+eps below + * is kept for keeping the code similar to the same test in the other d3d versions. + * + * For d3d10+ GPUs even an offset of 1/(1024^2) is enough to make a difference. dx9 GPUs + * (or at least r500, on which this was tested) need an offset of 1/128. dx7 (or rather, + * a Geforce 4 GO, AKA a rebranded geforce 2) need 1/64. + * + * GameFace is the only software we found that we know is picky regarding small geometry + * offsets. It needs d3d10 and newer. A number of games have been written for d3d9 that + * actually need d3d10 hardware (e.g. ARGB32F with filtering, some fourcc hacks). There + * might be something that needs the d3d10+ precision in the d3d9 API. So demand it if + * we find a d3d10+ GPU. */ + float eps = 0.0f; + struct { struct vec3 position; DWORD diffuse; @@ -27406,6 +27432,19 @@ static void test_filling_convention(void) hr = IDirect3DDevice9_SetRenderState(device, D3DRS_ZENABLE, D3DZB_FALSE); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
+ if (device_is_d3d10(device)) + eps = 1.0f / 512.0f; + else + eps = 1.0f / 64.0f; + + for (i = 0; i < 12; ++i) + { + nudge_right_tris[i].position.x +=eps; + nudge_left_tris[i].position.x -=eps; + nudge_top_tris[i].position.y +=eps; + nudge_bottom_tris[i].position.y -=eps; + } + for (i = 0; i < ARRAY_SIZE(tests); ++i) { hr = IDirect3DDevice9_SetFVF(device, tests[i].fvf);
Signed-off-by: Henri Verbeet hverbeet@codeweavers.com
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=105109
Your paranoid android.
=== w8adm (32 bit report) ===
ddraw: ddraw7.c:18714: Test failed: Got unexpected color 0x00000040.
=== w1064v1809 (32 bit report) ===
ddraw: ddraw7.c:18714: Test failed: Got unexpected color 0x00000040.
=== debian11 (32 bit Arabic:Morocco report) ===
ddraw: ddraw2.c:3313: Test failed: Expected (0,0)-(1024,768), got (0,0)-(640,480). ddraw2.c:3349: Test failed: Expected (0,0)-(1024,768), got (0,0)-(640,480). ddraw4.c:4354: Test failed: Got a different mode. ddraw7.c:630: Test failed: Got ddraw state 0x887600e1 on message 0x47, expected 0. ddraw7.c:623: Test failed: Got unexpected wparam 1 for message 5, expected 0. ddraw7.c:630: Test failed: Got ddraw state 0x887600e1 on message 0x5, expected 0. ddraw7.c:2986: Test failed: Expected message 0x7e, but didn't receive it. ddraw7.c:2993: Test failed: Got unexpected screen size 720x480. ddraw7.c:3049: Test failed: Expected screen size 1024x768, got 720x480. ddraw7.c:3055: Test failed: Expected (0,0)-(1024,768), got (0,0)-(720,480). ddraw7.c:3079: Test failed: Expected surface width 1024, got 720. ddraw7.c:3081: Test failed: Expected surface height 768, got 480. ddraw7.c:3085: Test failed: Expected (0,0)-(1024,768), got (0,0)-(720,480). ddraw7.c:3092: Test failed: Expected (0,0)-(1024,768), got (0,0)-(720,480). ddraw7.c:3097: Test failed: Expected surface width 1024, got 720. ddraw7.c:3099: Test failed: Expected surface height 768, got 480. ddraw7.c:3112: Test failed: Expected surface width 1024, got 720. ddraw7.c:3114: Test failed: Expected surface height 768, got 480. ddraw7.c:3118: Test failed: Expected (0,0)-(1024,768), got (0,0)-(720,480). ddraw7.c:3141: Test failed: Expected (0,0)-(1024,768), got (0,0)-(720,480). ddraw7.c:3150: Test failed: Got unexpected hr 0. ddraw7.c:3163: Test failed: Expected (0,0)-(1024,768), got (0,0)-(720,480). ddraw7.c:3168: Test failed: Expected surface width 1024, got 720. ddraw7.c:3170: Test failed: Expected surface height 768, got 480. ddraw7.c:3189: Test failed: Expected (0,0)-(1024,768), got (0,0)-(720,480). ddraw7.c:3209: Test failed: Expected (0,0)-(1024,768), got (0,0)-(720,480). ddraw7.c:3222: Test failed: Expected resolution 1024x768, got 720x480. ddraw7.c:3239: Test failed: Expected surface width 1024, got 720. ddraw7.c:3241: Test failed: Expected surface height 768, got 480. ddraw7.c:3245: Test failed: Expected (0,0)-(1024,768), got (0,0)-(720,480). ddraw7.c:3255: Test failed: Expected (0,0)-(1024,768), got (0,0)-(720,480). ddraw7.c:3260: Test failed: Expected surface width 1024, got 720. ddraw7.c:3262: Test failed: Expected surface height 768, got 480. ddraw7.c:3275: Test failed: Expected surface width 1024, got 720. ddraw7.c:3277: Test failed: Expected surface height 768, got 480. ddraw7.c:3281: Test failed: Expected (0,0)-(1024,768), got (0,0)-(720,480). ddraw7.c:3304: Test failed: Expected (0,0)-(1024,768), got (0,0)-(720,480). ddraw7.c:3313: Test failed: Got unexpected hr 0. ddraw7.c:3326: Test failed: Expected (0,0)-(1024,768), got (0,0)-(720,480). ddraw7.c:3331: Test failed: Expected surface width 1024, got 720. ddraw7.c:3333: Test failed: Expected surface height 768, got 480. ddraw7.c:3352: Test failed: Expected (0,0)-(1024,768), got (0,0)-(720,480). ddraw7.c:3372: Test failed: Expected (0,0)-(1024,768), got (0,0)-(720,480). ddraw7.c:3385: Test failed: Expected resolution 1024x768, got 720x480. ddraw7.c:3402: Test failed: Expected surface width 1024, got 720. ddraw7.c:3404: Test failed: Expected surface height 768, got 480. ddraw7.c:3409: Test failed: Expected (0,0)-(1024,768), got (0,0)-(720,480). ddraw7.c:3428: Test failed: Expected screen size 1024x768, got 720x480. ddraw7.c:3435: Test failed: Expected (0,0)-(1024,768), got (0,0)-(720,480). ddraw7.c:3447: Test failed: Expected surface width 1024, got 720. ddraw7.c:3449: Test failed: Expected surface height 768, got 480. ddraw7.c:3500: Test failed: Expected screen size 2 1024x768, got 720x480. ddraw7.c:3508: Test failed: Expected (0,0)-(1024,768), got (0,0)-(720,480). ddraw7.c:3520: Test failed: Expected surface width 1024, got 720. ddraw7.c:3522: Test failed: Expected surface height 768, got 480.
=== debian11 (32 bit German report) ===
ddraw: ddraw1.c:868: Test failed: Got unexpected wparam 1 for message 5, expected 0. ddraw1.c:2991: Test failed: Expected message 0x7e, but didn't receive it. ddraw1.c:2996: Test failed: Got unexpected screen size 720x480. ddraw1.c:3052: Test failed: Expected screen size 1024x768, got 720x480. ddraw1.c:3058: Test failed: Expected (0,0)-(1024,768), got (0,0)-(720,480). ddraw1.c:3082: Test failed: Expected surface width 1024, got 720. ddraw1.c:3084: Test failed: Expected surface height 768, got 480. ddraw1.c:3088: Test failed: Expected (0,0)-(1024,768), got (0,0)-(720,480). ddraw1.c:3095: Test failed: Expected (0,0)-(1024,768), got (0,0)-(720,480). ddraw1.c:3100: Test failed: Expected surface width 1024, got 720. ddraw1.c:3102: Test failed: Expected surface height 768, got 480. ddraw1.c:3115: Test failed: Expected surface width 1024, got 720. ddraw1.c:3117: Test failed: Expected surface height 768, got 480. ddraw1.c:3121: Test failed: Expected (0,0)-(1024,768), got (0,0)-(720,480). ddraw1.c:3144: Test failed: Expected (0,0)-(1024,768), got (0,0)-(720,480). ddraw1.c:3153: Test failed: Got unexpected hr 0. ddraw1.c:3173: Test failed: Expected (0,0)-(1024,768), got (0,0)-(720,480). ddraw1.c:3178: Test failed: Expected surface width 1024, got 720. ddraw1.c:3180: Test failed: Expected surface height 768, got 480. ddraw1.c:3199: Test failed: Expected (0,0)-(1024,768), got (0,0)-(720,480). ddraw1.c:3219: Test failed: Expected (0,0)-(1024,768), got (0,0)-(720,480). ddraw1.c:3232: Test failed: Expected resolution 1024x768, got 720x480. ddraw1.c:3249: Test failed: Expected surface width 1024, got 720. ddraw1.c:3251: Test failed: Expected surface height 768, got 480. ddraw1.c:3255: Test failed: Expected (0,0)-(1024,768), got (0,0)-(720,480). ddraw1.c:3265: Test failed: Expected (0,0)-(1024,768), got (0,0)-(720,480). ddraw1.c:3270: Test failed: Expected surface width 1024, got 720. ddraw1.c:3272: Test failed: Expected surface height 768, got 480. ddraw1.c:3285: Test failed: Expected surface width 1024, got 720. ddraw1.c:3287: Test failed: Expected surface height 768, got 480. ddraw1.c:3291: Test failed: Expected (0,0)-(1024,768), got (0,0)-(720,480). ddraw1.c:3314: Test failed: Expected (0,0)-(1024,768), got (0,0)-(720,480). ddraw1.c:3323: Test failed: Got unexpected hr 0. ddraw1.c:3336: Test failed: Expected (0,0)-(1024,768), got (0,0)-(720,480). ddraw1.c:3341: Test failed: Expected surface width 1024, got 720. ddraw1.c:3343: Test failed: Expected surface height 768, got 480. ddraw1.c:3362: Test failed: Expected (0,0)-(1024,768), got (0,0)-(720,480). ddraw1.c:3382: Test failed: Expected (0,0)-(1024,768), got (0,0)-(720,480). ddraw1.c:3395: Test failed: Expected resolution 1024x768, got 720x480. ddraw1.c:3412: Test failed: Expected surface width 1024, got 720. ddraw1.c:3414: Test failed: Expected surface height 768, got 480. ddraw1.c:3419: Test failed: Expected (0,0)-(1024,768), got (0,0)-(720,480). ddraw2.c:3293: Test failed: Expected (0,0)-(1024,768), got (0,0)-(640,480). ddraw2.c:3313: Test failed: Expected (0,0)-(1024,768), got (0,0)-(640,480). ddraw2.c:3349: Test failed: Expected (0,0)-(1024,768), got (0,0)-(640,480). ddraw2.c:4416: Test failed: Display mode not restored after ddraw1::CreateSurface() call ddraw2.c:6670: Test failed: Failed to attach surface, hr 0x8876000a. ddraw2.c:6673: Test failed: Got unexpected hr 0x8876000a. ddraw2.c:6675: Test failed: Failed to detach surface, hr 0x88760014. ddraw2.c:6678: Test failed: Failed to attach surface, hr 0x8876000a. ddraw2.c:6683: Test failed: Failed to detach surface, hr 0x88760014. ddraw2.c:15194: Test failed: Expect window rect (0,0)-(640,480), got (0,0)-(1024,737). ddraw2.c:15201: Test failed: Expect window rect (0,0)-(640,480), got (0,0)-(1024,737). ddraw4.c:2949: Test failed: Expected window style 0x4cf0000, got 0xb40b0000. ddraw4.c:2951: Test failed: Expected window extended style 0x100, got 0. ddraw7.c:3816: Test failed: Got unexpected screen width 800. ddraw7.c:3818: Test failed: Got unexpected screen height 600. ddraw7.c:3823: Test failed: Got unexpected screen width 800. ddraw7.c:3825: Test failed: Got unexpected screen height 600.
=== debian11 (32 bit Hindi:India report) ===
ddraw: ddraw1.c:14236: Test failed: Expected window rect (640,0)-(1664,737), got (0,0)-(1024,737). ddraw1.c:14251: Test failed: Expected window rect (640,0)-(1664,737), got (0,0)-(1024,737). ddraw2.c:15160: Test failed: Expected window rect (640,0)-(1664,737), got (0,0)-(1024,737). ddraw2.c:15175: Test failed: Expected window rect (640,0)-(1664,737), got (0,0)-(1024,737). ddraw4.c:4247: Test failed: Got a different mode. ddraw4.c:18197: Test failed: Expected window rect (640,0)-(1664,737), got (0,0)-(1024,737). ddraw4.c:18212: Test failed: Expected window rect (640,0)-(1664,737), got (0,0)-(1024,737). ddraw7.c:18464: Test failed: Expected window rect (640,0)-(1664,737), got (0,0)-(1024,737). ddraw7.c:18479: Test failed: Expected window rect (640,0)-(1664,737), got (0,0)-(1024,737).
=== debian11 (32 bit Japanese:Japan report) ===
ddraw: ddraw7.c:3671: Test failed: Got unexpected screen width 800. ddraw7.c:3673: Test failed: Got unexpected screen height 600. ddraw7.c:3696: Test failed: Got unexpected screen width 800. ddraw7.c:3698: Test failed: Got unexpected screen height 600. ddraw7.c:3703: Test failed: Got unexpected screen width 800. ddraw7.c:3705: Test failed: Got unexpected screen height 600. ddraw7.c:3727: Test failed: Got unexpected screen width 800. ddraw7.c:3729: Test failed: Got unexpected screen height 600. ddraw7.c:3734: Test failed: Got unexpected screen width 800. ddraw7.c:3736: Test failed: Got unexpected screen height 600. ddraw7.c:3758: Test failed: Got unexpected screen width 800. ddraw7.c:3760: Test failed: Got unexpected screen height 600. ddraw7.c:3793: Test failed: Got unexpected screen width 800. ddraw7.c:3795: Test failed: Got unexpected screen height 600. ddraw7.c:3816: Test failed: Got unexpected screen width 800. ddraw7.c:3818: Test failed: Got unexpected screen height 600. ddraw7.c:3823: Test failed: Got unexpected screen width 800. ddraw7.c:3825: Test failed: Got unexpected screen height 600.
=== debian11 (32 bit Chinese:China report) ===
Report validation errors: ddraw7: Timeout
=== debian11 (build log) ===
WineRunWineTest.pl:error: The task timed out
=== debian11 (64 bit WoW report) ===
ddraw: ddraw1.c:14214: Test failed: Expect window rect (0,0)-(800,600), got (0,0)-(1024,768). ddraw1.c:14270: Test failed: Expect window rect (0,0)-(800,600), got (0,0)-(1024,768). ddraw1.c:14277: Test failed: Expect window rect (0,0)-(800,600), got (0,0)-(1024,768). ddraw1.c:14214: Test failed: Expect window rect (0,0)-(800,600), got (0,0)-(1024,737). ddraw1.c:14236: Test failed: Expected window rect (800,0)-(1824,737), got (0,0)-(1024,737). ddraw1.c:14251: Test failed: Expected window rect (800,0)-(1824,737), got (0,0)-(1024,737). ddraw1.c:14270: Test failed: Expect window rect (0,0)-(800,600), got (1024,0)-(2048,737). ddraw1.c:14277: Test failed: Expect window rect (0,0)-(800,600), got (1024,0)-(2048,737). ddraw2.c:3928: Test failed: Got unexpected screen width 640. ddraw2.c:3930: Test failed: Got unexpected screen height 480. ddraw2.c:3935: Test failed: Got unexpected screen width 640. ddraw2.c:3937: Test failed: Got unexpected screen height 480. ddraw2.c:15138: Test failed: Expect window rect (0,0)-(800,600), got (0,0)-(1024,768). ddraw2.c:15194: Test failed: Expect window rect (0,0)-(800,600), got (0,0)-(1024,768). ddraw2.c:15201: Test failed: Expect window rect (0,0)-(800,600), got (0,0)-(1024,768). ddraw2.c:15138: Test failed: Expect window rect (0,0)-(800,600), got (0,0)-(1024,737). ddraw2.c:15160: Test failed: Expected window rect (800,0)-(1824,737), got (0,0)-(1024,737). ddraw2.c:15175: Test failed: Expected window rect (800,0)-(1824,737), got (0,0)-(1024,737). ddraw2.c:15194: Test failed: Expect window rect (0,0)-(800,600), got (1024,0)-(2048,737). ddraw2.c:15201: Test failed: Expect window rect (0,0)-(800,600), got (1024,0)-(2048,737).
-
Henri Verbeet -
Marvin -
Stefan Dösinger