aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/GrTextureProducer.h
diff options
context:
space:
mode:
authorGravatar Greg Daniel <egdaniel@google.com>2018-07-19 21:33:11 +0000
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-07-19 21:33:16 +0000
commitc861eee3a6f1f93ad3df27b8be94f44b245bd128 (patch)
tree1c4f0307a456002c784d6428e77c45b9032b7576 /src/gpu/GrTextureProducer.h
parent6a3957c1f9cbeca9107708462150fb766993ac0a (diff)
Revert "Don't require mips in GrTextureProducer if texture is 1x1."
This reverts commit 5191fd7555d34225ef771ad4cac65bcbbb50a89c. Reason for revert: breaking angle Original change's description: > Don't require mips in GrTextureProducer if texture is 1x1. > > Bug: chromium:862921 > Change-Id: I5f3584ad36e160a5a09d0a37e31e147155076b4d > Reviewed-on: https://skia-review.googlesource.com/142586 > Reviewed-by: Brian Osman <brianosman@google.com> > Reviewed-by: Brian Salomon <bsalomon@google.com> > Commit-Queue: Greg Daniel <egdaniel@google.com> TBR=egdaniel@google.com,bsalomon@google.com,brianosman@google.com Change-Id: Iaef7a56b061cb41f4c75ec20d8df77d3e52b194d No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: chromium:862921 Reviewed-on: https://skia-review.googlesource.com/142600 Reviewed-by: Greg Daniel <egdaniel@google.com> Commit-Queue: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'src/gpu/GrTextureProducer.h')
-rw-r--r--src/gpu/GrTextureProducer.h8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/gpu/GrTextureProducer.h b/src/gpu/GrTextureProducer.h
index 66adb6fa4e..b42bbcfc9a 100644
--- a/src/gpu/GrTextureProducer.h
+++ b/src/gpu/GrTextureProducer.h
@@ -124,9 +124,8 @@ public:
protected:
friend class GrTextureProducer_TestAccess;
- GrTextureProducer(GrContext* context, int width, int height, bool isAlphaOnly)
- : fContext(context)
- , fWidth(width)
+ GrTextureProducer(int width, int height, bool isAlphaOnly)
+ : fWidth(width)
, fHeight(height)
, fIsAlphaOnly(isAlphaOnly) {}
@@ -186,13 +185,10 @@ protected:
const SkRect& domain,
const GrSamplerState::Filter* filterOrNullForBicubic);
- GrContext* fContext;
-
private:
virtual sk_sp<GrTextureProxy> onRefTextureProxyForParams(const GrSamplerState&,
SkColorSpace* dstColorSpace,
sk_sp<SkColorSpace>* proxyColorSpace,
- bool willBeMipped,
SkScalar scaleAdjust[2]) = 0;
const int fWidth;