From 16f7c24296f2fbcfa7d8a18bf0f0a00c340d3e70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20D=C3=B6singer?= <stefan@codeweavers.com> Date: Wed, 9 Oct 2013 12:37:58 +0200 Subject: [PATCH] wined3d: Take sRGB_decode into account in texture_srgb_mode. --- dlls/wined3d/texture.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 56d13f67d56..0f3c4702f59 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -658,6 +658,7 @@ static HRESULT texture2d_bind(struct wined3d_texture *texture, static BOOL texture_srgb_mode(const struct wined3d_texture *texture, enum WINED3DSRGB srgb) { + const struct wined3d_gl_info *gl_info = &texture->resource.device->adapter->gl_info; switch (srgb) { case SRGB_RGB: @@ -667,7 +668,8 @@ static BOOL texture_srgb_mode(const struct wined3d_texture *texture, enum WINED3 return TRUE; default: - return texture->flags & WINED3D_TEXTURE_IS_SRGB; + return !gl_info->supported[EXT_TEXTURE_SRGB_DECODE] + && texture->flags & WINED3D_TEXTURE_IS_SRGB; } } -- GitLab