[Mesa-dev] [PATCH 2/2] (8.0) mesa: test for GL_EXT_framebuffer_sRGB in glPopAttrib()

[Kenneth Graunke]

On 11/28/2012 10:46 AM, Andreas Boll wrote:
> From: Brian Paul <brianp at vmware.com>
>
> To avoid spurious GL_INVALID_ENUM errors if the extension isn't supported.
> (cherry picked from commit 1aee8803f83f7ae24d9c2150c70afff2b1ee4c2f)
> ---
>
> Fixes a regression on 8.0 introduced with bd9f729091bbbce521d4526afd0230da2a7cf350
> git://github.com/pineerspacesim/pioneer dies with GL_INVALID_ENUM on llvmpipe
>
>   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:

Both of these seem reasonable to me.