=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: wined3d: Cleanup wined3d_check_surface_capability().
Alexandre Julliard
julliard at winehq.org
Thu Mar 28 18:35:12 CDT 2019
Module: wine
Branch: master
Commit: 0b7407287d0262a537de47d0f155c359a717895a
URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b7407287d0262a537de47d0f155c359a717895a
Author: Józef Kucia <jkucia at codeweavers.com>
Date: Thu Mar 28 09:53:51 2019 +0100
wined3d: Cleanup wined3d_check_surface_capability().
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
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 c66ed9c..8c40526 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;
}
More information about the wine-cvs
mailing list