Add fExternalFormatForTexImage to GrGLGpu::ConfigEntry. Use it in GrGLGpu::uploadTexData.

src/gpu/gl/GrGLGpu.h

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrGLGpu_DEFINED
 #define GrGLGpu_DEFINED
 
@@ skipping 532 matching lines @@
         // Default constructor inits to known bad GL enum values.
         ConfigEntry() {
             memset(this, 0xAB, sizeof(ConfigEntry));
             fStencilFormatIndex = kUnknown_StencilIndex;
         }
         GrGLenum fBaseInternalFormat;
         GrGLenum fSizedInternalFormat;
         GrGLenum fExternalFormat;
         GrGLenum fExternalType;
 
+        // The <format> parameter to use for glTexImage and glTexSubImage.
+        // This is usually the same as fExternalFormat except for kSRGBA on some GL contexts.
+        GrGLenum fExternalFormatForTexImage;
+
         // Index into GrGLCaps's list of stencil formats. Support is determined experimentally and
         // lazily.
         int      fStencilFormatIndex;
         enum {
             // This indicates that a stencil format has not yet been determined for the config.
             kUnknown_StencilIndex = -1,
             // This indicates that there is no supported stencil format for the config.
             kUnsupported_StencilFormatIndex = -2
         };
     };
 
     ConfigEntry fConfigTable[kGrPixelConfigCnt];
 
     typedef GrGpu INHERITED;
     friend class GrGLPathRendering; // For accessing setTextureUnit.
 };
 
 #endif