[PATCH 04/10] wined3d: Cleanup wined3d_check_surface_capability().

[Józef Kucia]

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com>
---
 dlls/wined3d/directx.c | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index c66ed9cd5d33..8c405260c6b7 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -1506,23 +1506,15 @@ static BOOL wined3d_check_render_target_format(const struct wined3d_adapter *ada
     return TRUE;
 }
 
-static BOOL wined3d_check_surface_capability(const struct wined3d_format *format)
+static BOOL wined3d_check_surface_format(const struct wined3d_format *format)
 {
     if ((format->flags[WINED3D_GL_RES_TYPE_TEX_2D] | format->flags[WINED3D_GL_RES_TYPE_RB]) & WINED3DFMT_FLAG_BLIT)
-    {
-        TRACE("[OK]\n");
         return TRUE;
-    }
 
     if ((format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & (WINED3DFMT_FLAG_EXTENSION | WINED3DFMT_FLAG_TEXTURE))
             == (WINED3DFMT_FLAG_EXTENSION | WINED3DFMT_FLAG_TEXTURE))
-    {
-        TRACE("[OK]\n");
         return TRUE;
-    }
 
-    /* Reject other formats */
-    TRACE("[FAILED]\n");
     return FALSE;
 }
 
@@ -1591,9 +1583,9 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad
                     | WINED3D_BIND_DEPTH_STENCIL;
             if (!(bind_flags & WINED3D_BIND_SHADER_RESOURCE))
             {
-                if (!wined3d_check_surface_capability(format))
+                if (!wined3d_check_surface_format(format))
                 {
-                    TRACE("[FAILED] - Not supported for plain surfaces.\n");
+                    TRACE("%s is not supported for plain surfaces.\n", debug_d3dformat(format->id));
                     return WINED3DERR_NOTAVAILABLE;
                 }
 
-- 
2.19.2

[Henri Verbeet]

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

[Marvin]

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=50067

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
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
Task: Patch failed to apply