diff options
Diffstat (limited to 'src/gpu/SkGr.cpp')
| -rw-r--r-- | src/gpu/SkGr.cpp | 30 |
1 files changed, 9 insertions, 21 deletions
diff --git a/src/gpu/SkGr.cpp b/src/gpu/SkGr.cpp index 528d133e2d..6767a1b50f 100644 --- a/src/gpu/SkGr.cpp +++ b/src/gpu/SkGr.cpp @@ -41,12 +41,12 @@ #include "effects/GrPorterDuffXferProcessor.h" #include "effects/GrXfermodeFragmentProcessor.h" -GrSurfaceDesc GrImageInfoToSurfaceDesc(const SkImageInfo& info, const GrCaps& caps) { +GrSurfaceDesc GrImageInfoToSurfaceDesc(const SkImageInfo& info) { GrSurfaceDesc desc; desc.fFlags = kNone_GrSurfaceFlags; desc.fWidth = info.width(); desc.fHeight = info.height(); - desc.fConfig = SkImageInfo2GrPixelConfig(info, caps); + desc.fConfig = SkImageInfo2GrPixelConfig(info); desc.fSampleCnt = 1; return desc; } @@ -66,17 +66,12 @@ void GrMakeKeyFromImageID(GrUniqueKey* key, uint32_t imageID, const SkIRect& ima ////////////////////////////////////////////////////////////////////////////// sk_sp<GrTextureProxy> GrUploadBitmapToTextureProxy(GrProxyProvider* proxyProvider, - const SkBitmap& bitmap, - SkColorSpace* dstColorSpace) { + const SkBitmap& bitmap) { if (!bitmap.peekPixels(nullptr)) { return nullptr; } - SkDestinationSurfaceColorMode colorMode = dstColorSpace - ? SkDestinationSurfaceColorMode::kGammaAndColorSpaceAware - : SkDestinationSurfaceColorMode::kLegacy; - - if (!SkImageInfoIsValid(bitmap.info(), colorMode)) { + if (!SkImageInfoIsValid(bitmap.info())) { return nullptr; } @@ -246,8 +241,7 @@ GrColor4f SkColorToUnpremulGrColor4f(SkColor c, const GrColorSpaceInfo& colorSpa /////////////////////////////////////////////////////////////////////////////// -GrPixelConfig SkImageInfo2GrPixelConfig(const SkColorType type, SkColorSpace* cs, - const GrCaps& caps) { +GrPixelConfig SkColorType2GrPixelConfig(const SkColorType type) { switch (type) { case kUnknown_SkColorType: return kUnknown_GrPixelConfig; @@ -258,15 +252,11 @@ GrPixelConfig SkImageInfo2GrPixelConfig(const SkColorType type, SkColorSpace* cs case kARGB_4444_SkColorType: return kRGBA_4444_GrPixelConfig; case kRGBA_8888_SkColorType: - return (caps.srgbSupport() && cs && cs->gammaCloseToSRGB()) - ? kSRGBA_8888_GrPixelConfig : kRGBA_8888_GrPixelConfig; - // TODO: We're checking for srgbSupport, but we can then end up picking sBGRA as our pixel - // config (which may not be supported). We need a better test here. + return kRGBA_8888_GrPixelConfig; case kRGB_888x_SkColorType: return kRGB_888_GrPixelConfig; case kBGRA_8888_SkColorType: - return (caps.srgbSupport() && cs && cs->gammaCloseToSRGB()) - ? kSBGRA_8888_GrPixelConfig : kBGRA_8888_GrPixelConfig; + return kBGRA_8888_GrPixelConfig; case kRGBA_1010102_SkColorType: return kRGBA_1010102_GrPixelConfig; case kRGB_101010x_SkColorType: @@ -280,8 +270,8 @@ GrPixelConfig SkImageInfo2GrPixelConfig(const SkColorType type, SkColorSpace* cs return kUnknown_GrPixelConfig; } -GrPixelConfig SkImageInfo2GrPixelConfig(const SkImageInfo& info, const GrCaps& caps) { - return SkImageInfo2GrPixelConfig(info.colorType(), info.colorSpace(), caps); +GrPixelConfig SkImageInfo2GrPixelConfig(const SkImageInfo& info) { + return SkColorType2GrPixelConfig(info.colorType()); } bool GrPixelConfigToColorType(GrPixelConfig config, SkColorType* ctOut) { @@ -322,8 +312,6 @@ static inline bool skpaint_to_grpaint_impl(GrContext* context, std::unique_ptr<GrFragmentProcessor>* shaderProcessor, SkBlendMode* primColorMode, GrPaint* grPaint) { - grPaint->setAllowSRGBInputs(colorSpaceInfo.isGammaCorrect()); - // Convert SkPaint color to 4f format, including optional linearizing and gamut conversion. GrColor4f origColor = SkColorToUnpremulGrColor4f(skPaint.getColor(), colorSpaceInfo); |