From c9ca9c5a7ef8949748c7e1ae7f22cabda48f5245 Mon Sep 17 00:00:00 2001 From: Henri Verbeet Date: Mon, 28 Jan 2013 11:15:40 +0100 Subject: [PATCH] wined3d: Get rid of CheckBumpMapCapability(). The color fixup being supported is implied by WINED3DFMT_FLAG_TEXTURE. --- dlls/wined3d/directx.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4c3851152da..d9e2607e768 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3429,16 +3429,6 @@ HRESULT CDECL wined3d_check_device_multisample_type(const struct wined3d *wined3 return WINED3D_OK; } -/* Check if we support bumpmapping for a format */ -static BOOL CheckBumpMapCapability(const struct wined3d_adapter *adapter, const struct wined3d_format *format) -{ - /* Ask the fixed function pipeline implementation if it can deal - * with the conversion. If we've got a GL extension giving native - * support this will be an identity conversion. */ - return (format->flags & WINED3DFMT_FLAG_BUMPMAP) - && adapter->fragment_pipe->color_fixup_supported(format->color_fixup); -} - /* Check if the given DisplayFormat + DepthStencilFormat combination is valid for the Adapter */ static BOOL CheckDepthStencilCapability(const struct wined3d_adapter *adapter, const struct wined3d_format *display_format, const struct wined3d_format *ds_format) @@ -3831,7 +3821,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad if (usage & WINED3DUSAGE_QUERY_LEGACYBUMPMAP) { - if (!CheckBumpMapCapability(adapter, format)) + if (!(format->flags & WINED3DFMT_FLAG_BUMPMAP)) { TRACE("[FAILED] - No legacy bumpmap support.\n"); return WINED3DERR_NOTAVAILABLE;