Mesa (8.0): mesa: test for GL_EXT_framebuffer_sRGB in glPopAttrib()

Andreas Boll ab at kemper.freedesktop.org
Thu Nov 29 10:44:35 UTC 2012


Module: Mesa
Branch: 8.0
Commit: 2286bd68a832a4d4908d50e1a4496853e1f3305a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2286bd68a832a4d4908d50e1a4496853e1f3305a

Author: Brian Paul <brianp at vmware.com>
Date:   Mon Aug 27 21:52:07 2012 -0600

mesa: test for GL_EXT_framebuffer_sRGB in glPopAttrib()

To avoid spurious GL_INVALID_ENUM errors if the extension isn't supported.
(cherry picked from commit 1aee8803f83f7ae24d9c2150c70afff2b1ee4c2f)

---

 src/mesa/main/attrib.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index 225ac89..cc384c7 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -993,7 +993,8 @@ _mesa_PopAttrib(void)
                _mesa_ClampColorARB(GL_CLAMP_READ_COLOR_ARB, color->ClampReadColor);
 
                /* GL_ARB_framebuffer_sRGB / GL_EXT_framebuffer_sRGB */
-               _mesa_set_enable(ctx, GL_FRAMEBUFFER_SRGB, color->sRGBEnabled);
+               if (ctx->Extensions.EXT_framebuffer_sRGB)
+                  _mesa_set_enable(ctx, GL_FRAMEBUFFER_SRGB, color->sRGBEnabled);
             }
             break;
          case GL_CURRENT_BIT:




More information about the mesa-commit mailing list