From fad6e2ea5a887844bf4d35e57e61d3462b89c1f4 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Sat, 17 Sep 2011 11:13:31 -0600 Subject: [PATCH] meta: fix/add checks for GL_EXT_framebuffer_sRGB 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 6e423253e74b462950445a7c10a913f5ab2a11c1) --- src/mesa/drivers/common/meta.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c index 0e58aeca3f5..23abaa361eb 100644 --- a/src/mesa/drivers/common/meta.c +++ b/src/mesa/drivers/common/meta.c @@ -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); }