[PATCH 0/3] MR6564: d3d: Do not apply the stateblock when clearing.
From: Elizabeth Figura <zfigura(a)codeweavers.com> --- dlls/d3d8/device.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index e9cdfa9b4ff..34799f1992d 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1723,7 +1723,6 @@ static HRESULT WINAPI d3d8_device_Clear(IDirect3DDevice8 *iface, DWORD rect_coun } wined3d_mutex_lock(); - wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_clear(device->wined3d_device, rect_count, (const RECT *)rects, flags, &c, z, stencil); wined3d_mutex_unlock(); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6564
From: Elizabeth Figura <zfigura(a)codeweavers.com> --- dlls/d3d9/device.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index b6a3e1f58ba..1620228dffb 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2046,7 +2046,6 @@ static HRESULT WINAPI d3d9_device_ColorFill(IDirect3DDevice9Ex *iface, return D3DERR_INVALIDCALL; } - wined3d_device_apply_stateblock(device->wined3d_device, device->state); rtv = d3d9_surface_acquire_rendertarget_view(surface_impl); hr = wined3d_device_context_clear_rendertarget_view(device->immediate_context, rtv, rect, WINED3DCLEAR_TARGET, &c, 0.0f, 0); @@ -2298,7 +2297,6 @@ static HRESULT WINAPI d3d9_device_Clear(IDirect3DDevice9Ex *iface, DWORD rect_co wined3d_color_from_d3dcolor(&c, color); wined3d_mutex_lock(); - wined3d_device_apply_stateblock(device->wined3d_device, device->state); hr = wined3d_device_clear(device->wined3d_device, rect_count, (const RECT *)rects, flags, &c, z, stencil); if (SUCCEEDED(hr)) d3d9_rts_flag_auto_gen_mipmap(device); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6564
From: Elizabeth Figura <zfigura(a)codeweavers.com> --- dlls/ddraw/device.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 896eea68f14..31e96f74c28 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -5173,7 +5173,6 @@ static HRESULT d3d_device7_Clear(IDirect3DDevice7 *iface, DWORD count, } wined3d_mutex_lock(); - wined3d_device_apply_stateblock(device->wined3d_device, device->state); d3d_device_sync_rendertarget(device); hr = wined3d_device_clear(device->wined3d_device, count, (RECT *)rects, flags, &c, z, stencil); wined3d_mutex_unlock(); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6564
Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details: The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=148687 Your paranoid android. === debian11 (32 bit report) === d3d9: visual.c:1292: Test failed: (158,118) has color 000000ff visual.c:1294: Test failed: (162,118) has color 000000ff visual.c:1296: Test failed: (158,122) has color 000000ff visual.c:1298: Test failed: (162,122) has color 0000ff00 visual.c:1301: Test failed: (318,238) has color 0000ff00 visual.c:1303: Test failed: (322,328) has color 0000ff00 visual.c:1305: Test failed: (318,242) has color 0000ff00 visual.c:1312: Test failed: (482,358) has color 000000ff visual.c:1314: Test failed: (478,362) has color 000000ff visual.c:1316: Test failed: (482,362) has color 000000ff visual.c:1338: Test failed: Pixel 158/118 has color 00ff0000 visual.c:1340: Test failed: Pixel 162/118 has color 00ff0000 visual.c:1342: Test failed: Pixel 158/122 has color 00ff0000 visual.c:1347: Test failed: Pixel 158/358 has color 0000ff00 visual.c:1351: Test failed: Pixel 158/358 has color 0000ff00 visual.c:1353: Test failed: Pixel 162/362 has color 0000ff00 visual.c:1356: Test failed: Pixel 158/118 has color 0000ff00 visual.c:1360: Test failed: Pixel 158/122 has color 0000ff00 visual.c:1362: Test failed: Pixel 162/122 has color 0000ff00 visual.c:1367: Test failed: Pixel 478/118 has color 0000ff00 visual.c:1369: Test failed: Pixel 482/122 has color 0000ff00 visual.c:1371: Test failed: Pixel 482/122 has color 0000ff00 visual.c:1500: Test failed: Clear has color 00bbbbbb. visual.c:1546: Test failed: Clear has color 00bbbbbb. visual.c:1633: Test failed: Got unexpected color 0x00000000. visual.c:1644: Test failed: Got depth 0x0000 at 1, 0. visual.c:1644: Test failed: Got depth 0x0000 at 2, 0. visual.c:1644: Test failed: Got depth 0x0000 at 3, 0. visual.c:1644: Test failed: Got depth 0x0000 at 0, 1. visual.c:1644: Test failed: Got depth 0x0000 at 1, 1. visual.c:1644: Test failed: Got depth 0x0000 at 2, 1. visual.c:1644: Test failed: Got depth 0x0000 at 3, 1. visual.c:1644: Test failed: Got depth 0x0000 at 0, 2. visual.c:1644: Test failed: Got depth 0x0000 at 1, 2. visual.c:1644: Test failed: Got depth 0x0000 at 2, 2. visual.c:1644: Test failed: Got depth 0x0000 at 3, 2. visual.c:1644: Test failed: Got depth 0x0000 at 0, 3. visual.c:1644: Test failed: Got depth 0x0000 at 1, 3. visual.c:1644: Test failed: Got depth 0x0000 at 2, 3. visual.c:1644: Test failed: Got depth 0x0000 at 3, 3. visual.c:25671: Test failed: Expected color 0x00000000 at (520, 320), got 0x00ff0000. ddraw: ddraw1.c:1274: Test failed: Got unexpected color 0x00ff0000. ddraw1.c:8967: Test failed: Got unexpected color 0x0000ff00. ddraw1.c:12903: Test failed: (158, 118) has color 0x000000ff. ddraw1.c:12907: Test failed: (162, 118) has color 0x000000ff. ddraw1.c:12911: Test failed: (158, 122) has color 0x000000ff. ddraw1.c:12915: Test failed: (162, 122) has color 0x0000ff00. ddraw1.c:12920: Test failed: (318, 238) has color 0x0000ff00. ddraw1.c:12924: Test failed: (322, 328) has color 0x0000ff00. ddraw1.c:12928: Test failed: (318, 242) has color 0x0000ff00. ddraw1.c:12937: Test failed: (482, 358) has color 0x000000ff. ddraw1.c:12941: Test failed: (478, 362) has color 0x000000ff. ddraw1.c:12945: Test failed: (482, 362) has color 0x000000ff. ddraw2.c:1161: Test failed: Got unexpected color 0x00ff0000. ddraw2.c:1173: Test failed: Got unexpected color 0x00ff0080. ddraw2.c:9876: Test failed: Got unexpected color 0x0000ff00. ddraw2.c:14062: Test failed: (158, 118) has color 0x000000ff. ddraw2.c:14064: Test failed: (162, 118) has color 0x000000ff. ddraw2.c:14066: Test failed: (158, 122) has color 0x000000ff. ddraw2.c:14068: Test failed: (162, 122) has color 0x0000ff00. ddraw2.c:14071: Test failed: (318, 238) has color 0x0000ff00. ddraw2.c:14073: Test failed: (322, 238) has color 0x0000ff00. ddraw2.c:14075: Test failed: (318, 242) has color 0x0000ff00. ddraw2.c:14082: Test failed: (482, 358) has color 0x000000ff. ddraw2.c:14084: Test failed: (478, 362) has color 0x000000ff. ddraw2.c:14086: Test failed: (482, 362) has color 0x000000ff. ddraw4.c:1346: Test failed: Got unexpected color 0x00ff0000. ddraw4.c:1358: Test failed: Got unexpected color 0x00ff0080. ddraw4.c:16678: Test failed: (158, 118) has color 0x000000ff. ddraw4.c:16680: Test failed: (162, 118) has color 0x000000ff. ddraw4.c:16682: Test failed: (158, 122) has color 0x000000ff. ddraw4.c:16684: Test failed: (162, 122) has color 0x0000ff00. ddraw4.c:16687: Test failed: (318, 238) has color 0x0000ff00. ddraw4.c:16689: Test failed: (322, 328) has color 0x0000ff00. ddraw4.c:16691: Test failed: (318, 242) has color 0x0000ff00. ddraw4.c:16698: Test failed: (482, 358) has color 0x000000ff. ddraw4.c:16700: Test failed: (478, 362) has color 0x000000ff. ddraw4.c:16702: Test failed: (482, 362) has color 0x000000ff. ddraw7.c:1441: Test failed: Got unexpected color 0x00ff0000. ddraw7.c:1451: Test failed: Got unexpected color 0x00ff0000. ddraw7.c:16276: Test failed: (158, 118) has color 0x000000ff. ddraw7.c:16278: Test failed: (162, 118) has color 0x000000ff. ddraw7.c:16280: Test failed: (158, 122) has color 0x000000ff. ddraw7.c:16282: Test failed: (162, 122) has color 0x0000ff00. ddraw7.c:16285: Test failed: (318, 238) has color 0x0000ff00. ddraw7.c:16287: Test failed: (322, 328) has color 0x0000ff00. ddraw7.c:16289: Test failed: (318, 242) has color 0x0000ff00. ddraw7.c:16296: Test failed: (482, 358) has color 0x000000ff. ddraw7.c:16298: Test failed: (478, 362) has color 0x000000ff. ddraw7.c:16300: Test failed: (482, 362) has color 0x000000ff. visual.c:1106: Test failed: Got color 00ff0000, expected 0000ff00 === debian11b (64 bit WoW report) === d3d9: visual.c:1292: Test failed: (158,118) has color 000000ff visual.c:1294: Test failed: (162,118) has color 000000ff visual.c:1296: Test failed: (158,122) has color 000000ff visual.c:1298: Test failed: (162,122) has color 0000ff00 visual.c:1301: Test failed: (318,238) has color 0000ff00 visual.c:1303: Test failed: (322,328) has color 0000ff00 visual.c:1305: Test failed: (318,242) has color 0000ff00 visual.c:1312: Test failed: (482,358) has color 000000ff visual.c:1314: Test failed: (478,362) has color 000000ff visual.c:1316: Test failed: (482,362) has color 000000ff visual.c:1338: Test failed: Pixel 158/118 has color 00ff0000 visual.c:1340: Test failed: Pixel 162/118 has color 00ff0000 visual.c:1342: Test failed: Pixel 158/122 has color 00ff0000 visual.c:1347: Test failed: Pixel 158/358 has color 0000ff00 visual.c:1351: Test failed: Pixel 158/358 has color 0000ff00 visual.c:1353: Test failed: Pixel 162/362 has color 0000ff00 visual.c:1356: Test failed: Pixel 158/118 has color 0000ff00 visual.c:1360: Test failed: Pixel 158/122 has color 0000ff00 visual.c:1362: Test failed: Pixel 162/122 has color 0000ff00 visual.c:1367: Test failed: Pixel 478/118 has color 0000ff00 visual.c:1369: Test failed: Pixel 482/122 has color 0000ff00 visual.c:1371: Test failed: Pixel 482/122 has color 0000ff00 visual.c:1500: Test failed: Clear has color 00bbbbbb. visual.c:1546: Test failed: Clear has color 00bbbbbb. visual.c:1633: Test failed: Got unexpected color 0x00000000. visual.c:1644: Test failed: Got depth 0x0000 at 1, 0. visual.c:1644: Test failed: Got depth 0x0000 at 2, 0. visual.c:1644: Test failed: Got depth 0x0000 at 3, 0. visual.c:1644: Test failed: Got depth 0x0000 at 0, 1. visual.c:1644: Test failed: Got depth 0x0000 at 1, 1. visual.c:1644: Test failed: Got depth 0x0000 at 2, 1. visual.c:1644: Test failed: Got depth 0x0000 at 3, 1. visual.c:1644: Test failed: Got depth 0x0000 at 0, 2. visual.c:1644: Test failed: Got depth 0x0000 at 1, 2. visual.c:1644: Test failed: Got depth 0x0000 at 2, 2. visual.c:1644: Test failed: Got depth 0x0000 at 3, 2. visual.c:1644: Test failed: Got depth 0x0000 at 0, 3. visual.c:1644: Test failed: Got depth 0x0000 at 1, 3. visual.c:1644: Test failed: Got depth 0x0000 at 2, 3. visual.c:1644: Test failed: Got depth 0x0000 at 3, 3. visual.c:25671: Test failed: Expected color 0x00000000 at (520, 320), got 0x00ff0000. ddraw: ddraw1.c:1274: Test failed: Got unexpected color 0x00ff0000. ddraw1.c:8967: Test failed: Got unexpected color 0x0000ff00. ddraw1.c:12903: Test failed: (158, 118) has color 0x000000ff. ddraw1.c:12907: Test failed: (162, 118) has color 0x000000ff. ddraw1.c:12911: Test failed: (158, 122) has color 0x000000ff. ddraw1.c:12915: Test failed: (162, 122) has color 0x0000ff00. ddraw1.c:12920: Test failed: (318, 238) has color 0x0000ff00. ddraw1.c:12924: Test failed: (322, 328) has color 0x0000ff00. ddraw1.c:12928: Test failed: (318, 242) has color 0x0000ff00. ddraw1.c:12937: Test failed: (482, 358) has color 0x000000ff. ddraw1.c:12941: Test failed: (478, 362) has color 0x000000ff. ddraw1.c:12945: Test failed: (482, 362) has color 0x000000ff. ddraw2.c:1161: Test failed: Got unexpected color 0x00ff0000. ddraw2.c:1173: Test failed: Got unexpected color 0x00ff0080. ddraw2.c:9876: Test failed: Got unexpected color 0x0000ff00. ddraw2.c:14062: Test failed: (158, 118) has color 0x000000ff. ddraw2.c:14064: Test failed: (162, 118) has color 0x000000ff. ddraw2.c:14066: Test failed: (158, 122) has color 0x000000ff. ddraw2.c:14068: Test failed: (162, 122) has color 0x0000ff00. ddraw2.c:14071: Test failed: (318, 238) has color 0x0000ff00. ddraw2.c:14073: Test failed: (322, 238) has color 0x0000ff00. ddraw2.c:14075: Test failed: (318, 242) has color 0x0000ff00. ddraw2.c:14082: Test failed: (482, 358) has color 0x000000ff. ddraw2.c:14084: Test failed: (478, 362) has color 0x000000ff. ddraw2.c:14086: Test failed: (482, 362) has color 0x000000ff. ddraw4.c:1346: Test failed: Got unexpected color 0x00ff0000. ddraw4.c:1358: Test failed: Got unexpected color 0x00ff0080. ddraw4.c:16678: Test failed: (158, 118) has color 0x000000ff. ddraw4.c:16680: Test failed: (162, 118) has color 0x000000ff. ddraw4.c:16682: Test failed: (158, 122) has color 0x000000ff. ddraw4.c:16684: Test failed: (162, 122) has color 0x0000ff00. ddraw4.c:16687: Test failed: (318, 238) has color 0x0000ff00. ddraw4.c:16689: Test failed: (322, 328) has color 0x0000ff00. ddraw4.c:16691: Test failed: (318, 242) has color 0x0000ff00. ddraw4.c:16698: Test failed: (482, 358) has color 0x000000ff. ddraw4.c:16700: Test failed: (478, 362) has color 0x000000ff. ddraw4.c:16702: Test failed: (482, 362) has color 0x000000ff. ddraw7.c:1441: Test failed: Got unexpected color 0x00ff0000. ddraw7.c:1451: Test failed: Got unexpected color 0x00ff0000. ddraw7.c:16276: Test failed: (158, 118) has color 0x000000ff. ddraw7.c:16278: Test failed: (162, 118) has color 0x000000ff. ddraw7.c:16280: Test failed: (158, 122) has color 0x000000ff. ddraw7.c:16282: Test failed: (162, 122) has color 0x0000ff00. ddraw7.c:16285: Test failed: (318, 238) has color 0x0000ff00. ddraw7.c:16287: Test failed: (322, 328) has color 0x0000ff00. ddraw7.c:16289: Test failed: (318, 242) has color 0x0000ff00. ddraw7.c:16296: Test failed: (482, 358) has color 0x000000ff. ddraw7.c:16298: Test failed: (478, 362) has color 0x000000ff. ddraw7.c:16300: Test failed: (482, 362) has color 0x000000ff. visual.c:1106: Test failed: Got color 00ff0000, expected 0000ff00
participants (3)
-
Elizabeth Figura -
Elizabeth Figura (＠zfigura)
-
Marvin