aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main/blend.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-09-27 15:15:06 +0200
committermarha <marha@users.sourceforge.net>2012-09-27 15:15:06 +0200
commit24703f26d8ed55b1971aa2e94d33636e871bff0b (patch)
tree3e57b600f4446a1db1d8e73cb8a83519570eb678 /mesalib/src/mesa/main/blend.c
parent94ef26cb962261d0b47daf7ef3c856510999bd4c (diff)
parent2cf1e3de4759264eac2fa8ac758ea750636542f8 (diff)
downloadvcxsrv-24703f26d8ed55b1971aa2e94d33636e871bff0b.tar.gz
vcxsrv-24703f26d8ed55b1971aa2e94d33636e871bff0b.tar.bz2
vcxsrv-24703f26d8ed55b1971aa2e94d33636e871bff0b.zip
Merge remote-tracking branch 'origin/released'
* origin/released: mesa xserver pixman xkeyboard-config git update 27 sep 2012
Diffstat (limited to 'mesalib/src/mesa/main/blend.c')
-rw-r--r--mesalib/src/mesa/main/blend.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/mesalib/src/mesa/main/blend.c b/mesalib/src/mesa/main/blend.c
index de871a92a..5d553118c 100644
--- a/mesalib/src/mesa/main/blend.c
+++ b/mesalib/src/mesa/main/blend.c
@@ -858,6 +858,13 @@ void _mesa_init_color( struct gl_context * ctx )
ctx->Color._ClampFragmentColor = GL_TRUE;
ctx->Color.ClampReadColor = GL_FIXED_ONLY_ARB;
ctx->Color._ClampReadColor = GL_TRUE;
+
+ 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;
+ }
}
/*@}*/