SampleApp now displays gamma-correct content in "S32" and "F16" modes. The default framebuffer is a…

src/views/SkWindow.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 "SkWindow.h"
 #include "SkCanvas.h"
 #include "SkOSMenu.h"
@@ skipping 308 matching lines @@
 #include "GrContext.h"
 #include "gl/GrGLInterface.h"
 #include "gl/GrGLUtil.h"
 #include "SkGr.h"
 
 GrRenderTarget* SkWindow::renderTarget(const AttachmentInfo& attachmentInfo,
         const GrGLInterface* interface, GrContext* grContext) {
     GrBackendRenderTargetDesc desc;
     desc.fWidth = SkScalarRoundToInt(this->width());
     desc.fHeight = SkScalarRoundToInt(this->height());
-    desc.fConfig = kSkia8888_GrPixelConfig;
+    // TODO: Query the actual framebuffer for sRGB capable. However, to
+    // preserve old (fake-linear) behavior, we don't do this. Instead, rely
+    // on the flag (currently driven via 'C' mode in SampleApp).
+    desc.fConfig = (info().profileType() == kSRGB_SkColorProfileType ||
+                    info().colorType() == kRGBA_F16_SkColorType)
+        ? kSRGBA_8888_GrPixelConfig // This may not be the right byte-order
+        : kSkia8888_GrPixelConfig;
     desc.fOrigin = kBottomLeft_GrSurfaceOrigin;
     desc.fSampleCnt = attachmentInfo.fSampleCount;
     desc.fStencilBits = attachmentInfo.fStencilBits;
     GrGLint buffer;
     GR_GL_GetIntegerv(interface, GR_GL_FRAMEBUFFER_BINDING, &buffer);
     desc.fRenderTargetHandle = buffer;
     return grContext->textureProvider()->wrapBackendRenderTarget(desc);
 }
 
 #endif