diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-09-07 12:36:34 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-09-07 16:58:31 +0000 |
| commit | 2bbdcc44c63974f29f3743bb58d929601a3f65c6 (patch) | |
| tree | d420f298f606b061054e56866d1930ab84f00ed5 /src/image/SkImage_Raster.cpp | |
| parent | 4df0092eac6e9bb5afc516773a0c618630193dc6 (diff) | |
Rework GrSamplerParams to be more compact and use its own wrap mode enum.
The main change is to make GrSamplerParams smaller by making its enums have byte-sized underlying types. The rest is cosmetic.
Change-Id: Ib71ea50612d24619a85e463826c6b8dfb9b445e3
Reviewed-on: https://skia-review.googlesource.com/43200
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'src/image/SkImage_Raster.cpp')
| -rw-r--r-- | src/image/SkImage_Raster.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/image/SkImage_Raster.cpp b/src/image/SkImage_Raster.cpp index 5b7e83f3a7..bade1b6235 100644 --- a/src/image/SkImage_Raster.cpp +++ b/src/image/SkImage_Raster.cpp @@ -88,8 +88,8 @@ public: const SkBitmap* onPeekBitmap() const override { return &fBitmap; } #if SK_SUPPORT_GPU - sk_sp<GrTextureProxy> asTextureProxyRef(GrContext*, const GrSamplerParams&, - SkColorSpace*, sk_sp<SkColorSpace>*, + sk_sp<GrTextureProxy> asTextureProxyRef(GrContext*, const GrSamplerState&, SkColorSpace*, + sk_sp<SkColorSpace>*, SkScalar scaleAdjust[2]) const override; #endif @@ -171,7 +171,7 @@ bool SkImage_Raster::getROPixels(SkBitmap* dst, SkColorSpace* dstColorSpace, Cac #if SK_SUPPORT_GPU sk_sp<GrTextureProxy> SkImage_Raster::asTextureProxyRef(GrContext* context, - const GrSamplerParams& params, + const GrSamplerState& params, SkColorSpace* dstColorSpace, sk_sp<SkColorSpace>* texColorSpace, SkScalar scaleAdjust[2]) const { @@ -215,8 +215,8 @@ bool SkImage_Raster::onPinAsTexture(GrContext* ctx) const { } else { SkASSERT(fPinnedCount == 0); SkASSERT(fPinnedUniqueID == 0); - fPinnedProxy = GrRefCachedBitmapTextureProxy(ctx, fBitmap, - GrSamplerParams::ClampNoFilter(), nullptr); + fPinnedProxy = GrRefCachedBitmapTextureProxy(ctx, fBitmap, GrSamplerState::ClampNearest(), + nullptr); if (!fPinnedProxy) { return false; } |