Henri Verbeet : wined3d: Get rid of CheckFilterCapability().
Alexandre Julliard
julliard at winehq.org
Wed Jan 23 16:40:18 CST 2013
Module: wine
Branch: master
Commit: d6105c5f0fb4921a32ca194545500e1c64963016
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6105c5f0fb4921a32ca194545500e1c64963016
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Wed Jan 23 08:50:13 2013 +0100
wined3d: Get rid of CheckFilterCapability().
---
dlls/wined3d/directx.c | 15 +++------------
1 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index b49e897..5b3de2e 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -3482,15 +3482,6 @@ static BOOL CheckDepthStencilCapability(const struct wined3d_adapter *adapter,
return FALSE;
}
-static BOOL CheckFilterCapability(const struct wined3d_adapter *adapter, const struct wined3d_format *format)
-{
- /* The flags entry of a format contains the filtering capability */
- if (format->flags & WINED3DFMT_FLAG_FILTERING)
- return TRUE;
-
- return FALSE;
-}
-
/* Check the render target capabilities of a format */
static BOOL CheckRenderTargetCapability(const struct wined3d_adapter *adapter,
const struct wined3d_format *adapter_format, const struct wined3d_format *check_format)
@@ -3983,7 +3974,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad
if (usage & WINED3DUSAGE_QUERY_FILTER)
{
- if (!CheckFilterCapability(adapter, format))
+ if (!(format->flags & WINED3DFMT_FLAG_FILTERING))
{
TRACE("[FAILED] - No filter support.\n");
return WINED3DERR_NOTAVAILABLE;
@@ -4139,7 +4130,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad
if (usage & WINED3DUSAGE_QUERY_FILTER)
{
- if (!CheckFilterCapability(adapter, format))
+ if (!(format->flags & WINED3DFMT_FLAG_FILTERING))
{
TRACE("[FAILED] - No filter support.\n");
return WINED3DERR_NOTAVAILABLE;
@@ -4317,7 +4308,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad
if (usage & WINED3DUSAGE_QUERY_FILTER)
{
- if (!CheckFilterCapability(adapter, format))
+ if (!(format->flags & WINED3DFMT_FLAG_FILTERING))
{
TRACE("[FAILED] - No filter support.\n");
return WINED3DERR_NOTAVAILABLE;
More information about the wine-cvs
mailing list