diff options
author | Mike Reed <reed@google.com> | 2017-11-08 13:23:21 -0500 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-11-08 18:43:37 +0000 |
commit | 47ba5cd0974273192c83cc27addb9ae1880c1d6d (patch) | |
tree | 1341627cea6a2c527ed745104a482f2fdafdb6a2 /src/core/SkPictureImageGenerator.cpp | |
parent | f479e42981f6572ec17b178aa95608eb5196eefa (diff) |
change default props for PictureImage to be unknown_pixel_geometry
Bug: skia:
Change-Id: Id61460dbe3f3d21207ae05ba5adf494b0a68fe31
Reviewed-on: https://skia-review.googlesource.com/68760
Commit-Queue: Mike Reed <reed@google.com>
Reviewed-by: Florin Malita <fmalita@chromium.org>
Diffstat (limited to 'src/core/SkPictureImageGenerator.cpp')
-rw-r--r-- | src/core/SkPictureImageGenerator.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/core/SkPictureImageGenerator.cpp b/src/core/SkPictureImageGenerator.cpp index 1f0439eb88..4b68ffdd93 100644 --- a/src/core/SkPictureImageGenerator.cpp +++ b/src/core/SkPictureImageGenerator.cpp @@ -63,8 +63,10 @@ bool SkPictureImageGenerator::onGetPixels(const SkImageInfo& info, void* pixels, bool useXformCanvas = SkTransferFunctionBehavior::kIgnore == opts.fBehavior && info.colorSpace(); + SkSurfaceProps props(0, kUnknown_SkPixelGeometry); SkImageInfo canvasInfo = useXformCanvas ? info.makeColorSpace(nullptr) : info; - std::unique_ptr<SkCanvas> canvas = SkCanvas::MakeRasterDirect(canvasInfo, pixels, rowBytes); + std::unique_ptr<SkCanvas> canvas = SkCanvas::MakeRasterDirect(canvasInfo, pixels, rowBytes, + &props); if (!canvas) { return false; } @@ -109,9 +111,10 @@ sk_sp<GrTextureProxy> SkPictureImageGenerator::onGenerateTexture( // // TODO: respect the usage, by possibly creating a different (pow2) surface // + SkSurfaceProps props(0, kUnknown_SkPixelGeometry); SkImageInfo surfaceInfo = useXformCanvas ? info.makeColorSpace(nullptr) : info; sk_sp<SkSurface> surface(SkSurface::MakeRenderTarget(ctx, SkBudgeted::kYes, surfaceInfo, - 0, kTopLeft_GrSurfaceOrigin, nullptr, + 0, kTopLeft_GrSurfaceOrigin, &props, willNeedMipMaps)); if (!surface) { return nullptr; |