From 3a0dbde1cfa84b08c7dd5b597142e9f6179f2d07 Mon Sep 17 00:00:00 2001 From: brianosman Date: Tue, 26 Jul 2016 11:36:05 -0700 Subject: Remove SkSurfaceProps gamma-correctness flag entirely. This is no longer required - gamma-correctness is now just based on the presence or absence of a color space. Public API change is just removal of (unused) flag. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2188463002 TBR=bsalomon@google.com Review-Url: https://codereview.chromium.org/2188463002 --- tools/viewer/sk_app/WindowContext.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'tools/viewer') diff --git a/tools/viewer/sk_app/WindowContext.cpp b/tools/viewer/sk_app/WindowContext.cpp index 5d364bc497..458f66a67b 100755 --- a/tools/viewer/sk_app/WindowContext.cpp +++ b/tools/viewer/sk_app/WindowContext.cpp @@ -31,11 +31,6 @@ sk_sp WindowContext::createRenderSurface(GrBackendRenderTargetDesc de sk_sp WindowContext::createSurface( GrBackendRenderTargetDesc* rtDesc, int colorBits, bool offscreen, bool forceSRGB) { - auto flags = (fSurfaceProps.flags() & ~SkSurfaceProps::kGammaCorrect_Flag) | - (GrPixelConfigIsSRGB(fPixelConfig) || forceSRGB ? - SkSurfaceProps::kGammaCorrect_Flag : 0); - SkSurfaceProps props(flags, fSurfaceProps.pixelGeometry()); - if (!this->isGpuContext() || colorBits > 24 || offscreen || kRGBA_F16_SkColorType == fDisplayParams.fColorType) { // If we're rendering to F16, we need an off-screen surface - the current render @@ -52,12 +47,12 @@ sk_sp WindowContext::createSurface( ); if (this->isGpuContext()) { return SkSurface::MakeRenderTarget(fContext, SkBudgeted::kNo, info, - fDisplayParams.fMSAASampleCount, &props); + fDisplayParams.fMSAASampleCount, &fSurfaceProps); } else { - return SkSurface::MakeRaster(info, &props); + return SkSurface::MakeRaster(info, &fSurfaceProps); } } else { - return SkSurface::MakeFromBackendRenderTarget(fContext, *rtDesc, &props); + return SkSurface::MakeFromBackendRenderTarget(fContext, *rtDesc, &fSurfaceProps); } } -- cgit v1.2.3