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/GrTextureAdjuster.cpp

diff --git a/src/gpu/GrTextureAdjuster.cpp b/src/gpu/GrTextureAdjuster.cpp
index d30a1a4..affd8a5 100644
--- a/src/gpu/GrTextureAdjuster.cpp
+++ b/src/gpu/GrTextureAdjuster.cpp
@@ -73,7 +73,6 @@
 
 sk_sp<GrTextureProxy> GrTextureAdjuster::onRefTextureProxyForParams(
         const GrSamplerState& params,
-        sk_sp<SkColorSpace>* texColorSpace,
         bool willBeMipped,
         SkScalar scaleAdjust[2]) {
     sk_sp<GrTextureProxy> proxy = this->originalProxyRef();
@@ -84,9 +83,6 @@
         return nullptr;
     }
 
-    if (texColorSpace) {
-        *texColorSpace = sk_ref_sp(fColorSpace);
-    }
     SkASSERT(this->width() <= fContext->contextPriv().caps()->maxTextureSize() &&
              this->height() <= fContext->contextPriv().caps()->maxTextureSize());
 
@@ -129,7 +125,7 @@
     }
     SkScalar scaleAdjust[2] = { 1.0f, 1.0f };
     sk_sp<GrTextureProxy> proxy(
-            this->refTextureProxyForParams(samplerState, nullptr, scaleAdjust));
+            this->refTextureProxyForParams(samplerState, scaleAdjust));
     if (!proxy) {
         return nullptr;
     }