commit 1d2c41d612abb740b7a7f50dfa8ff6878ca1a144
author Geoff Lang <geofflang@chromium.org> Wed Oct 19 16:14:46 2016 -0700
committer Commit Bot <commit-bot@chromium.org> Thu Oct 27 18:38:44 2016 +0000
tree f17390326d3fc4f87712b5039cbafeab63fd2afc
parent 0e3aee3fef9ecbacfd86f2d34a1481e617a00b51

Implement GL_EXT_sRGB_write_control for GL.

BUG=angleproject:1547
BUG=655247

Change-Id: I3f04ddc7032e4a47eb21ff3b8586c5b47415bb64
Reviewed-on: https://chromium-review.googlesource.com/400958
Commit-Queue: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>

src/libANGLE/renderer/gl/FramebufferGL.cpp

diff --git a/src/libANGLE/renderer/gl/FramebufferGL.cpp b/src/libANGLE/renderer/gl/FramebufferGL.cpp
index f8b2522..e66905d 100644
--- a/src/libANGLE/renderer/gl/FramebufferGL.cpp
+++ b/src/libANGLE/renderer/gl/FramebufferGL.cpp
@@ -332,7 +332,7 @@
     }
 
     // Enable FRAMEBUFFER_SRGB if needed
-    syncDrawState();
+    mStateManager->setFramebufferSRGBEnabledForFramebuffer(true, this);
 
     GLenum blitMask = mask;
     if (needManualColorBlit && (mask & GL_COLOR_BUFFER_BIT))
@@ -421,17 +421,9 @@
     return mFramebufferID;
 }
 
-void FramebufferGL::syncDrawState() const
+bool FramebufferGL::isDefault() const
 {
-    if (mFunctions->standard == STANDARD_GL_DESKTOP)
-    {
-        // Enable SRGB blending for all framebuffers except the default framebuffer on Desktop
-        // OpenGL.
-        // When SRGB blending is enabled, only SRGB capable formats will use it but the default
-        // framebuffer will always use it if it is enabled.
-        // TODO(geofflang): Update this when the framebuffer binding dirty changes, when it exists.
-        mStateManager->setFramebufferSRGBEnabled(!mIsDefault);
-    }
+    return mIsDefault;
 }
 
 void FramebufferGL::syncClearState(GLbitfield mask)