Skip to content

W
wine-winehq
Commit 9fc3444d authored by Matteo Bruni's avatar Matteo Bruni Committed by Alexandre Julliard
Browse files
Options

wined3d: Correctly handle GL implementations not supporting sRGB FBO attachments.

Signed-off-by: 's avatarMatteo Bruni <mbruni@codeweavers.com> Signed-off-by: 's avatarHenri Verbeet <hverbeet@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 7e30dc8b
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 3 deletions
dlls/wined3d/directx.c
View file @ 9fc3444d
...@@ -3893,6 +3893,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD ...@@ -3893,6 +3893,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD
/* Current wined3d sRGB infrastructure requires EXT_texture_sRGB_decode /* Current wined3d sRGB infrastructure requires EXT_texture_sRGB_decode
* for GL_ARB_framebuffer_sRGB support (without EXT_texture_sRGB_decode * for GL_ARB_framebuffer_sRGB support (without EXT_texture_sRGB_decode
* we never render to sRGB surfaces). */ * we never render to sRGB surfaces). */
TRACE("EXT_texture_sRGB_decode is not supported, disabling ARB_framebuffer_sRGB.\n");
gl_info->supported[ARB_FRAMEBUFFER_SRGB] = FALSE; gl_info->supported[ARB_FRAMEBUFFER_SRGB] = FALSE;
} }
if (gl_info->supported[ARB_OCCLUSION_QUERY]) if (gl_info->supported[ARB_OCCLUSION_QUERY])
......
dlls/wined3d/utils.c
View file @ 9fc3444d
...@@ -1220,7 +1220,7 @@ static const struct wined3d_format_texture_info format_texture_info[] = ...@@ -1220,7 +1220,7 @@ static const struct wined3d_format_texture_info format_texture_info[] =
WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_RENDERTARGET, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_RENDERTARGET,
EXT_PACKED_FLOAT}, EXT_PACKED_FLOAT},
/* Palettized formats */ /* Palettized formats */
{WINED3DFMT_P8_UINT, GL_R8, GL_R8, 0, {WINED3DFMT_P8_UINT, GL_R8, GL_R8, 0,
GL_RED, GL_UNSIGNED_BYTE, 0, GL_RED, GL_UNSIGNED_BYTE, 0,
0, 0,
ARB_TEXTURE_RG, NULL}, ARB_TEXTURE_RG, NULL},
...@@ -2382,11 +2382,14 @@ static void check_fbo_compat(struct wined3d_caps_gl_ctx *ctx, struct wined3d_for ...@@ -2382,11 +2382,14 @@ static void check_fbo_compat(struct wined3d_caps_gl_ctx *ctx, struct wined3d_for
TRACE("Format %s's sRGB format is FBO attachable, type %u.\n", TRACE("Format %s's sRGB format is FBO attachable, type %u.\n",
debug_d3dformat(format->id), type); debug_d3dformat(format->id), type);
format->flags[type] |= WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB; format->flags[type] |= WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB;
if (gl_info->supported[EXT_TEXTURE_SRGB_DECODE])
format->glInternal = format->glGammaInternal;
} }
else else
{ {
WARN("Format %s's sRGB format is not FBO attachable, type %u.\n", WARN("Format %s's sRGB format is not FBO attachable, type %u.\n",
debug_d3dformat(format->id), type); debug_d3dformat(format->id), type);
format_clear_flag(format, WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE);
} }
} }
else if (status == GL_FRAMEBUFFER_COMPLETE) else if (status == GL_FRAMEBUFFER_COMPLETE)
...@@ -2523,11 +2526,14 @@ static void init_format_fbo_compat_info(struct wined3d_caps_gl_ctx *ctx) ...@@ -2523,11 +2526,14 @@ static void init_format_fbo_compat_info(struct wined3d_caps_gl_ctx *ctx)
TRACE("Format %s's sRGB format is FBO attachable, resource type %u.\n", TRACE("Format %s's sRGB format is FBO attachable, resource type %u.\n",
debug_d3dformat(format->id), type); debug_d3dformat(format->id), type);
format->flags[type] |= WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB; format->flags[type] |= WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB;
if (gl_info->supported[EXT_TEXTURE_SRGB_DECODE])
format->glInternal = format->glGammaInternal;
} }
else else
{ {
WARN("Format %s's sRGB format is not FBO attachable, resource type %u.\n", WARN("Format %s's sRGB format is not FBO attachable, resource type %u.\n",
debug_d3dformat(format->id), type); debug_d3dformat(format->id), type);
format_clear_flag(format, WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE);
} }
} }
else if (format->flags[type] & WINED3DFMT_FLAG_FBO_ATTACHABLE) else if (format->flags[type] & WINED3DFMT_FLAG_FBO_ATTACHABLE)
...@@ -2739,7 +2745,8 @@ static void query_internal_format(struct wined3d_adapter *adapter, ...@@ -2739,7 +2745,8 @@ static void query_internal_format(struct wined3d_adapter *adapter,
if (!(format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & (WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE))) if (!(format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & (WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE)))
format->glGammaInternal = format->glInternal; format->glGammaInternal = format->glInternal;
else if (gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) else if (wined3d_settings.offscreen_rendering_mode != ORM_FBO
&& gl_info->supported[EXT_TEXTURE_SRGB_DECODE])
format->glInternal = format->glGammaInternal; format->glInternal = format->glGammaInternal;
} }
} }
...@@ -2761,7 +2768,8 @@ static void query_internal_format(struct wined3d_adapter *adapter, ...@@ -2761,7 +2768,8 @@ static void query_internal_format(struct wined3d_adapter *adapter,
format->glGammaInternal = format->glInternal; format->glGammaInternal = format->glInternal;
format_clear_flag(format, WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE); format_clear_flag(format, WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_SRGB_WRITE);
} }
else if (gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) else if (wined3d_settings.offscreen_rendering_mode != ORM_FBO
&& gl_info->supported[EXT_TEXTURE_SRGB_DECODE])
{ {
format->glInternal = format->glGammaInternal; format->glInternal = format->glGammaInternal;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment