1 files changed, 4 insertions, 10 deletions
diff --git a/src/image/SkSurface_Gpu.cpp b/src/image/SkSurface_Gpu.cpp
index c20608aac2..8f7958444d 100644
--- a/src/image/SkSurface_Gpu.cpp
+++ b/src/image/SkSurface_Gpu.cpp
@@ -269,10 +269,9 @@ bool SkSurface_Gpu::onDraw(const SkDeferredDisplayList* ddl) {
 bool SkSurface_Gpu::Valid(const SkImageInfo& info) {
     switch (info.colorType()) {
         case kRGBA_F16_SkColorType:
-            return true;
         case kRGBA_8888_SkColorType:
         case kBGRA_8888_SkColorType:
-            return !info.colorSpace() || info.colorSpace()->gammaCloseToSRGB();
+            return true;
         default:
             return !info.colorSpace();
     }
@@ -280,18 +279,13 @@ bool SkSurface_Gpu::Valid(const SkImageInfo& info) {
 
 bool SkSurface_Gpu::Valid(const GrCaps* caps, GrPixelConfig config, SkColorSpace* colorSpace) {
     switch (config) {
-        case kRGBA_half_GrPixelConfig:
-            return true;
         case kSRGBA_8888_GrPixelConfig:
         case kSBGRA_8888_GrPixelConfig:
-            return caps->srgbSupport() && colorSpace && colorSpace->gammaCloseToSRGB();
+            return caps->srgbSupport();
+        case kRGBA_half_GrPixelConfig:
         case kRGBA_8888_GrPixelConfig:
         case kBGRA_8888_GrPixelConfig:
-            // We may get here with either a linear-gamma color space or with a sRGB-gamma color
-            // space when we lack GPU sRGB support.
-            return !colorSpace ||
-                   (colorSpace->gammaCloseToSRGB() && !caps->srgbSupport()) ||
-                   colorSpace->gammaIsLinear();
+            return true;
         default:
             return !colorSpace;
     }