commit 6064e1c5d6194137c361e3fc97ebcb71cf6d507f
author Brian Osman <brianosman@google.com> Fri Oct 19 14:27:54 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Oct 19 19:44:24 2018 +0000
tree c53ebd0b7796e92f28d80e9c1ace1d84472e4664
parent 41ba826ad7b4dd1a057de5b88903526dc10d22e2

Remove texColorSpace output param from various producer APIs

Just expose colorSpace on the GrTextureProducer, and if a client needs
it, they can get it from there.

Bug: skia:
Change-Id: I5134b1c9b2780274f3d6571d9fe8cd2a6b6ce7e9
Reviewed-on: https://skia-review.googlesource.com/c/163888
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>

src/gpu/GrTextureMaker.cpp

diff --git a/src/gpu/GrTextureMaker.cpp b/src/gpu/GrTextureMaker.cpp
index 213a1a8..b373306 100644
--- a/src/gpu/GrTextureMaker.cpp
+++ b/src/gpu/GrTextureMaker.cpp
@@ -14,7 +14,6 @@
 #include "GrProxyProvider.h"
 
 sk_sp<GrTextureProxy> GrTextureMaker::onRefTextureProxyForParams(const GrSamplerState& params,
-                                                                 sk_sp<SkColorSpace>* texColorSpace,
                                                                  bool willBeMipped,
                                                                  SkScalar scaleAdjust[2]) {
     if (this->width() > fContext->contextPriv().caps()->maxTextureSize() ||
@@ -24,10 +23,6 @@
 
     CopyParams copyParams;
 
-    if (texColorSpace) {
-        *texColorSpace = this->getColorSpace();
-    }
-
     sk_sp<GrTextureProxy> original(this->refOriginalTextureProxy(willBeMipped,
                                                                  AllowedTexGenType::kCheap));
     bool needsCopyForMipsOnly = false;
@@ -133,10 +128,8 @@
         // Bicubic doesn't use filtering for it's texture accesses.
         samplerState = GrSamplerState::ClampNearest();
     }
-    sk_sp<SkColorSpace> texColorSpace;
     SkScalar scaleAdjust[2] = { 1.0f, 1.0f };
-    sk_sp<GrTextureProxy> proxy(this->refTextureProxyForParams(samplerState, &texColorSpace,
-                                                               scaleAdjust));
+    sk_sp<GrTextureProxy> proxy(this->refTextureProxyForParams(samplerState, scaleAdjust));
     if (!proxy) {
         return nullptr;
     }
@@ -149,6 +142,6 @@
     SkASSERT(kTightCopy_DomainMode != domainMode);
     auto fp = CreateFragmentProcessorForDomainAndFilter(std::move(proxy), adjustedMatrix,
                                                         domainMode, domain, filterOrNullForBicubic);
-    return GrColorSpaceXformEffect::Make(std::move(fp), texColorSpace.get(), this->alphaType(),
+    return GrColorSpaceXformEffect::Make(std::move(fp), this->colorSpace(), this->alphaType(),
                                          dstColorSpace);
 }