diff options
author | Brian Osman <brianosman@google.com> | 2016-12-09 14:51:59 -0500 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-12-09 20:31:23 +0000 |
commit | 61624f0c716b576706659750d87b6956f4c15722 (patch) | |
tree | 00122b478cf21327b70364fefc5f3f9a6169377e /gm/yuvtorgbeffect.cpp | |
parent | 073285c0595d46205d1482cc19af2d7d891bfeae (diff) |
Plumb dst color space in many places, rather than "mode"
This is less to type in most cases, and gives us more information
(for things like picture-backed images, where we need to know all
about the destination surface).
Additionally, strip out the plumbing entirely for bitmap sources,
where we don't need to know anything.
BUG=skia:
Change-Id: I4deff6c7c345fcf62eb08b2aff0560adae4313da
Reviewed-on: https://skia-review.googlesource.com/5748
Reviewed-by: Mike Klein <mtklein@chromium.org>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Diffstat (limited to 'gm/yuvtorgbeffect.cpp')
-rw-r--r-- | gm/yuvtorgbeffect.cpp | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/gm/yuvtorgbeffect.cpp b/gm/yuvtorgbeffect.cpp index 6b90dad9cc..db0cf1b1ad 100644 --- a/gm/yuvtorgbeffect.cpp +++ b/gm/yuvtorgbeffect.cpp @@ -82,14 +82,11 @@ protected: sk_sp<GrTexture> texture[3]; texture[0].reset( - GrRefCachedBitmapTexture(context, fBmp[0], GrSamplerParams::ClampBilerp(), - SkDestinationSurfaceColorMode::kGammaAndColorSpaceAware)); + GrRefCachedBitmapTexture(context, fBmp[0], GrSamplerParams::ClampBilerp())); texture[1].reset( - GrRefCachedBitmapTexture(context, fBmp[1], GrSamplerParams::ClampBilerp(), - SkDestinationSurfaceColorMode::kGammaAndColorSpaceAware)); + GrRefCachedBitmapTexture(context, fBmp[1], GrSamplerParams::ClampBilerp())); texture[2].reset( - GrRefCachedBitmapTexture(context, fBmp[2], GrSamplerParams::ClampBilerp(), - SkDestinationSurfaceColorMode::kGammaAndColorSpaceAware)); + GrRefCachedBitmapTexture(context, fBmp[2], GrSamplerParams::ClampBilerp())); if (!texture[0] || !texture[1] || !texture[2]) { return; @@ -207,14 +204,11 @@ protected: sk_sp<GrTexture> texture[3]; texture[0].reset( - GrRefCachedBitmapTexture(context, fBmp[0], GrSamplerParams::ClampBilerp(), - SkDestinationSurfaceColorMode::kGammaAndColorSpaceAware)); + GrRefCachedBitmapTexture(context, fBmp[0], GrSamplerParams::ClampBilerp())); texture[1].reset( - GrRefCachedBitmapTexture(context, fBmp[1], GrSamplerParams::ClampBilerp(), - SkDestinationSurfaceColorMode::kGammaAndColorSpaceAware)); + GrRefCachedBitmapTexture(context, fBmp[1], GrSamplerParams::ClampBilerp())); texture[2].reset( - GrRefCachedBitmapTexture(context, fBmp[1], GrSamplerParams::ClampBilerp(), - SkDestinationSurfaceColorMode::kGammaAndColorSpaceAware)); + GrRefCachedBitmapTexture(context, fBmp[1], GrSamplerParams::ClampBilerp())); if (!texture[0] || !texture[1] || !texture[2]) { return; |