Further work on sRGB support.

src/gpu/gl/GrGLGpu.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "GrGLGpu.h"
 #include "GrGLStencilAttachment.h"
@@ skipping 2366 matching lines @@
                 } else {
                     *internalFormat = GR_GL_RGBA;
                 }
             }
             *externalFormat = GR_GL_BGRA;
             *externalType = GR_GL_UNSIGNED_BYTE;
             break;
         case kSRGBA_8888_GrPixelConfig:
             *internalFormat = GR_GL_SRGB_ALPHA;
             *externalFormat = GR_GL_SRGB_ALPHA;
-            if (getSizedInternalFormat) {
+            if (getSizedInternalFormat || kGL_GrGLStandard == this->glStandard()) {
+                // desktop or ES 3.0
+                SkASSERT(this->glVersion() >= GR_GL_VER(3, 0));
                 *internalFormat = GR_GL_SRGB8_ALPHA8;
+                *externalFormat = GR_GL_RGBA;
             } else {
+                // ES 2.0 with EXT_sRGB
+                SkASSERT(kGL_GrGLStandard != this->glStandard() && 
+                         this->glVersion() < GR_GL_VER(3, 0));
                 *internalFormat = GR_GL_SRGB_ALPHA;
+                *externalFormat = GR_GL_SRGB_ALPHA;
             }
             *externalType = GR_GL_UNSIGNED_BYTE;
             break;
         case kRGB_565_GrPixelConfig:
             *internalFormat = GR_GL_RGB;
             *externalFormat = GR_GL_RGB;
             if (getSizedInternalFormat) {
                 if (!this->glCaps().ES2CompatibilitySupport()) {
                     *internalFormat = GR_GL_RGB5;
                 } else {
@@ skipping 465 matching lines @@
             this->setVertexArrayID(gpu, 0);
         }
         int attrCount = gpu->glCaps().maxVertexAttributes();
         if (fDefaultVertexArrayAttribState.count() != attrCount) {
             fDefaultVertexArrayAttribState.resize(attrCount);
         }
         attribState = &fDefaultVertexArrayAttribState;
     }
     return attribState;
 }