Matteo Bruni : wined3d: Update feature check for mipmap generation support.
Alexandre Julliard
julliard at winehq.org
Wed Feb 14 15:12:11 CST 2018
Module: wine
Branch: master
Commit: c7ebc8ec3229bbfd2a0d6e0f0c0c02c8ee87e98f
URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7ebc8ec3229bbfd2a0d6e0f0c0c02c8ee87e98f
Author: Matteo Bruni <mbruni at codeweavers.com>
Date: Tue Feb 13 01:00:43 2018 +0100
wined3d: Update feature check for mipmap generation support.
Signed-off-by: Matteo Bruni <mbruni 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 | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c
index a1e679b..2139b65 100644
--- a/dlls/wined3d/directx.c
+++ b/dlls/wined3d/directx.c
@@ -5296,7 +5296,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad
const struct wined3d_gl_info *gl_info = &adapter->gl_info;
const struct wined3d_format *adapter_format, *format;
enum wined3d_gl_resource_type gl_type, gl_type_end;
- BOOL mipmap_autogen_supported = TRUE;
+ BOOL mipmap_gen_supported = TRUE;
DWORD format_flags = 0;
DWORD allowed_usage;
@@ -5440,10 +5440,10 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad
}
if (!(format->flags[gl_type] & WINED3DFMT_FLAG_GEN_MIPMAP))
- mipmap_autogen_supported = FALSE;
+ mipmap_gen_supported = FALSE;
}
- if ((usage & WINED3DUSAGE_AUTOGENMIPMAP) && !mipmap_autogen_supported)
+ if ((usage & WINED3DUSAGE_AUTOGENMIPMAP) && !mipmap_gen_supported)
{
TRACE("No WINED3DUSAGE_AUTOGENMIPMAP support, returning WINED3DOK_NOAUTOGEN.\n");
return WINED3DOK_NOAUTOGEN;
@@ -5618,7 +5618,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte
caps->Caps2 = WINED3DCAPS2_CANRENDERWINDOWED |
WINED3DCAPS2_FULLSCREENGAMMA |
WINED3DCAPS2_DYNAMICTEXTURES;
- if (gl_info->supported[SGIS_GENERATE_MIPMAP])
+ if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT] || gl_info->supported[EXT_FRAMEBUFFER_OBJECT])
caps->Caps2 |= WINED3DCAPS2_CANAUTOGENMIPMAP;
caps->Caps3 = WINED3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD |
More information about the wine-cvs
mailing list