fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-17 00:58:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

meta: fix/add checks for GL_EXT_framebuffer_sRGB

Browse source 
This fixes spurious GL errors when the GL_EXT_framebuffer_sRGB extension
is not supported.

Note: This is a candidate for the 7.11 branch
(cherry picked from commit 6e423253e7)
This commit is contained in:
Brian Paul 2011-09-17 11:13:31 -06:00 • committed by Marek Olšák
parent a73c667069
commit fad6e2ea5a
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/mesa/drivers/common/meta.c
View file

@ -1225,7 +1225,9 @@ blitframebuffer_texture(struct gl_context *ctx,
_mesa_TexParameteri(target, GL_TEXTURE_SRGB_DECODE_EXT,
GL_SKIP_DECODE_EXT);
}
_mesa_Disable(GL_FRAMEBUFFER_SRGB_EXT);
if (ctx->Extensions.EXT_framebuffer_sRGB) {
_mesa_Disable(GL_FRAMEBUFFER_SRGB_EXT);
}
_mesa_TexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
_mesa_set_enable(ctx, target, GL_TRUE);
@ -1291,7 +1293,7 @@ blitframebuffer_texture(struct gl_context *ctx,
if (ctx->Extensions.EXT_texture_sRGB_decode) {
_mesa_TexParameteri(target, GL_TEXTURE_SRGB_DECODE_EXT, srgbSave);
}
if (ctx->Extensions.EXT_texture_sRGB_decode && fbo_srgb_save) {
if (ctx->Extensions.EXT_framebuffer_sRGB && fbo_srgb_save) {
_mesa_Enable(GL_FRAMEBUFFER_SRGB_EXT);
}