diff options
author | Greg Daniel <egdaniel@google.com> | 2018-07-19 21:33:11 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-07-19 21:33:16 +0000 |
commit | c861eee3a6f1f93ad3df27b8be94f44b245bd128 (patch) | |
tree | 1c4f0307a456002c784d6428e77c45b9032b7576 /src/gpu/GrTextureMaker.h | |
parent | 6a3957c1f9cbeca9107708462150fb766993ac0a (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/GrTextureMaker.h')
-rw-r--r-- | src/gpu/GrTextureMaker.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gpu/GrTextureMaker.h b/src/gpu/GrTextureMaker.h index e2dd3c852a..a365b50444 100644 --- a/src/gpu/GrTextureMaker.h +++ b/src/gpu/GrTextureMaker.h @@ -28,7 +28,8 @@ public: protected: GrTextureMaker(GrContext* context, int width, int height, bool isAlphaOnly) - : INHERITED(context, width, height, isAlphaOnly) {} + : INHERITED(width, height, isAlphaOnly) + , fContext(context) {} /** * Return the maker's "original" texture. It is the responsibility of the maker to handle any @@ -53,9 +54,10 @@ private: sk_sp<GrTextureProxy> onRefTextureProxyForParams(const GrSamplerState&, SkColorSpace* dstColorSpace, sk_sp<SkColorSpace>* proxyColorSpace, - bool willBeMipped, SkScalar scaleAdjust[2]) override; + GrContext* fContext; + typedef GrTextureProducer INHERITED; }; |