[PATCH 07/10] wined3d: Use adapter_check_format() in wined3d_check_depth_stencil_format().
Signed-off-by: Józef Kucia jkucia@codeweavers.com --- dlls/wined3d/adapter_gl.c | 3 ++- dlls/wined3d/directx.c | 21 ++------------------- 2 files changed, 4 insertions(+), 20 deletions(-)
diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index a076a988eb3e..30c1515bbdaa 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4398,7 +4398,8 @@ static BOOL adapter_gl_check_format(const struct wined3d_adapter *adapter, { const struct wined3d_pixel_format *cfg = &adapter->cfgs[i];
- if (wined3d_check_pixel_format_color(cfg, rt_format) + if ((!adapter_format || wined3d_check_pixel_format_color(cfg, adapter_format)) + && (!rt_format || wined3d_check_pixel_format_color(cfg, rt_format)) && wined3d_check_pixel_format_depth(cfg, ds_format)) { return TRUE; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 8e7713858a8e..801d11c89f4a 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1331,7 +1331,6 @@ HRESULT CDECL wined3d_check_depth_stencil_match(const struct wined3d *wined3d, UINT adapter_idx, enum wined3d_device_type device_type, enum wined3d_format_id adapter_format_id, enum wined3d_format_id render_target_format_id, enum wined3d_format_id depth_stencil_format_id) { - const struct wined3d_format *adapter_format; const struct wined3d_format *rt_format; const struct wined3d_format *ds_format; const struct wined3d_adapter *adapter; @@ -1346,7 +1345,6 @@ HRESULT CDECL wined3d_check_depth_stencil_match(const struct wined3d *wined3d,
adapter = wined3d->adapters[adapter_idx];
- adapter_format = wined3d_get_format(adapter, adapter_format_id, WINED3D_BIND_RENDER_TARGET); rt_format = wined3d_get_format(adapter, render_target_format_id, WINED3D_BIND_RENDER_TARGET); ds_format = wined3d_get_format(adapter, depth_stencil_format_id, WINED3D_BIND_DEPTH_STENCIL);
@@ -1361,7 +1359,7 @@ HRESULT CDECL wined3d_check_depth_stencil_match(const struct wined3d *wined3d, return WINED3DERR_NOTAVAILABLE; }
- if (adapter->adapter_ops->adapter_check_format(adapter, adapter_format, rt_format, ds_format)) + if (adapter->adapter_ops->adapter_check_format(adapter, NULL, rt_format, ds_format)) { TRACE("Formats match.\n"); return WINED3D_OK; @@ -1438,22 +1436,7 @@ static BOOL wined3d_check_depth_stencil_format(const struct wined3d_adapter *ada return FALSE; }
- if (wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER) - { - unsigned int i; - - for (i = 0; i < adapter->cfg_count; ++i) - { - const struct wined3d_pixel_format *cfg = &adapter->cfgs[i]; - if (wined3d_check_pixel_format_color(cfg, adapter_format) - && wined3d_check_pixel_format_depth(cfg, ds_format)) - return TRUE; - } - - return FALSE; - } - - return TRUE; + return adapter->adapter_ops->adapter_check_format(adapter, adapter_format, NULL, ds_format); }
static BOOL wined3d_check_render_target_format(const struct wined3d_adapter *adapter,
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=50070
Your paranoid android.
=== debian9 (build log) ===
error: patch failed: dlls/wined3d/directx.c:1428 error: patch failed: dlls/wined3d/directx.c:1434 error: patch failed: dlls/wined3d/directx.c:1463 error: patch failed: dlls/wined3d/directx.c:1506 error: patch failed: dlls/wined3d/directx.c:1335 error: patch failed: dlls/wined3d/adapter_gl.c:4385 error: patch failed: dlls/wined3d/directx.c:1277 error: patch failed: dlls/wined3d/wined3d_private.h:2680 error: patch failed: dlls/wined3d/adapter_gl.c:4398 error: patch failed: dlls/wined3d/directx.c:1331 Task: Patch failed to apply
=== debian9 (build log) ===
error: patch failed: dlls/wined3d/directx.c:1428 error: patch failed: dlls/wined3d/directx.c:1434 error: patch failed: dlls/wined3d/directx.c:1463 error: patch failed: dlls/wined3d/directx.c:1506 error: patch failed: dlls/wined3d/directx.c:1335 error: patch failed: dlls/wined3d/adapter_gl.c:4385 error: patch failed: dlls/wined3d/directx.c:1277 error: patch failed: dlls/wined3d/wined3d_private.h:2680 error: patch failed: dlls/wined3d/adapter_gl.c:4398 error: patch failed: dlls/wined3d/directx.c:1331 Task: Patch failed to apply
-
Henri Verbeet -
Józef Kucia -
Marvin