Mesa (master): mesa: fix sRGB rendering for GLES1

Marek Olšák mareko at kemper.freedesktop.org
Fri Jul 3 14:30:20 UTC 2015


Module: Mesa
Branch: master
Commit: 9e127325ef461a11345df7ba6884e77c7168ab37
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9e127325ef461a11345df7ba6884e77c7168ab37

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Wed Jun 10 02:53:33 2015 +0200

mesa: fix sRGB rendering for GLES1

---

 src/mesa/main/blend.c |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/mesa/main/blend.c b/src/mesa/main/blend.c
index d869fa2..d365305 100644
--- a/src/mesa/main/blend.c
+++ b/src/mesa/main/blend.c
@@ -930,12 +930,10 @@ void _mesa_init_color( struct gl_context * ctx )
    ctx->Color._ClampFragmentColor = GL_FALSE;
    ctx->Color.ClampReadColor = GL_FIXED_ONLY_ARB;
 
-   if (ctx->API == API_OPENGLES2) {
-      /* GLES 3 behaves as though GL_FRAMEBUFFER_SRGB is always enabled. */
-      ctx->Color.sRGBEnabled = GL_TRUE;
-   } else {
-      ctx->Color.sRGBEnabled = GL_FALSE;
-   }
+   /* GLES 1/2/3 behaves as though GL_FRAMEBUFFER_SRGB is always enabled
+    * if EGL_KHR_gl_colorspace has been used to request sRGB.
+    */
+   ctx->Color.sRGBEnabled = _mesa_is_gles(ctx);
 }
 
 /*@}*/




More information about the mesa-commit mailing list