diff options
| author |  Brian Osman <brianosman@google.com> | 2017-01-12 17:18:22 -0500 |
|---|---|---|
| committer | Brian Osman <brianosman@google.com> | 2017-01-13 14:53:48 +0000 |
| commit | c74dad6f1850ebed53b07366380724bd63fadf4f (patch) | |
| tree | 83cdf0d438b46b50f32e93f926e8484eff86dedc /src | |
| parent | 523116d9fee8b79af09563b55b19cbd267353300 (diff) | |
Remove spurious checks for sRGB float data
We don't support this. F16 or F32 textures must be built with a linear
transfer function, if any.
BUG=skia:
Change-Id: Ia8d83a03d12ddc3b70f5d7e4fabed72f6c2af538
Reviewed-on: https://skia-review.googlesource.com/6978
Reviewed-by: Robert Phillips <robertphillips@google.com>
Reviewed-by: Matt Sarett <msarett@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gpu/SkGr.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp index 5c937d40e8..eec3cd70d2 100644 --- a/src/gpu/SkGr.cpp +++ b/src/gpu/SkGr.cpp @@ -177,9 +177,7 @@ GrTexture* GrUploadPixmapToTexture(GrContext* ctx, const SkPixmap& pixmap, SkBud if (caps->srgbSupport() && pixmap.info().colorSpace() && pixmap.info().colorSpace()->gammaCloseToSRGB() && - !(GrPixelConfigIsSRGB(desc.fConfig) || - kRGBA_half_GrPixelConfig == desc.fConfig || - kRGBA_float_GrPixelConfig == desc.fConfig)) { + !GrPixelConfigIsSRGB(desc.fConfig)) { // We were supplied an sRGB-like color space, but we don't have a suitable pixel config. // Convert to 8888 sRGB so we can handle the data correctly. The raster backend doesn't // handle sRGB Index8 -> sRGB 8888 correctly (yet), so lie about both the source and |