diff options
| author |  Brian Osman <brianosman@google.com> | 2017-01-11 16:58:42 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-01-12 14:31:31 +0000 |
| commit | 0c2997b6d85e381e63e3af98245a87bf04753681 (patch) | |
| tree | 2b476059185efd3b32377397c5ab3c280e5e2ac7 /include/gpu/SkGr.h | |
| parent | d0be1ef36c64c2a420cbd82f4c033704d4c54a07 (diff) | |
Remove second version of SkImageInfo2GrPixelConfig
Alpha type is not (and never will be) part of pixel config, so the logic
around that was unnecessary. (Also, we already sanitize color type and
alpha type before making a new device at a higher level).
With that out of the way, we can easily supply a full info at the two
call-sites that were using the other version.
BUG=skia:
Change-Id: Iceccdbdebd1062d3e5023620755aabcc86604d2f
Reviewed-on: https://skia-review.googlesource.com/6920
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Diffstat (limited to 'include/gpu/SkGr.h')
| -rw-r--r-- | include/gpu/SkGr.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/include/gpu/SkGr.h b/include/gpu/SkGr.h index e59720e82d..e2f09e5ac2 100644 --- a/include/gpu/SkGr.h +++ b/include/gpu/SkGr.h @@ -84,12 +84,7 @@ GrTexture* GrRefCachedBitmapTexture(GrContext*, const SkBitmap&, const GrSampler sk_sp<GrTexture> GrMakeCachedBitmapTexture(GrContext*, const SkBitmap&, const GrSamplerParams&); // TODO: Move SkImageInfo2GrPixelConfig to SkGrPriv.h (requires cleanup to SkWindow its subclasses). -GrPixelConfig SkImageInfo2GrPixelConfig(SkColorType, SkAlphaType, const SkColorSpace*, - const GrCaps&); - -static inline GrPixelConfig SkImageInfo2GrPixelConfig(const SkImageInfo& info, const GrCaps& caps) { - return SkImageInfo2GrPixelConfig(info.colorType(), info.alphaType(), info.colorSpace(), caps); -} +GrPixelConfig SkImageInfo2GrPixelConfig(const SkImageInfo& info, const GrCaps& caps); GrSamplerParams::FilterMode GrSkFilterQualityToGrFilterMode(SkFilterQuality paintFilterQuality, const SkMatrix& viewM, |