diff options
author | mtklein <mtklein@chromium.org> | 2016-09-15 04:43:03 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-09-15 04:43:03 -0700 |
commit | c518a76105ce10f06e117697f72e774eef355265 (patch) | |
tree | dfe803c3ad1932414118aef2970593dec88ed5dd /src/core/SkPictureRecorder.cpp | |
parent | 14e7a602d0cae354417ea963940b092d298adf4d (diff) |
Clean up unused SkPictureRecorder::optimizeFor()
Don't worry about the failing Shield bot... unrelated experiment. It's failing at head.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2340133002
NOTREECHECKS=true
Review-Url: https://codereview.chromium.org/2340133002
Diffstat (limited to 'src/core/SkPictureRecorder.cpp')
-rw-r--r-- | src/core/SkPictureRecorder.cpp | 51 |
1 files changed, 0 insertions, 51 deletions
diff --git a/src/core/SkPictureRecorder.cpp b/src/core/SkPictureRecorder.cpp index 8e7c7f3b06..5631a081d4 100644 --- a/src/core/SkPictureRecorder.cpp +++ b/src/core/SkPictureRecorder.cpp @@ -8,7 +8,6 @@ #include "SkBigPicture.h" #include "SkData.h" #include "SkDrawable.h" -#include "SkImage.h" #include "SkPictureRecorder.h" #include "SkPictureUtils.h" #include "SkRecord.h" @@ -17,54 +16,6 @@ #include "SkRecordedDrawable.h" #include "SkRecorder.h" #include "SkTypes.h" -#include "SkTLogic.h" - -namespace SkRecords { - - struct OptimizeFor { - GrContext* fCtx; - - // A few ops have a top-level SkImage: - void operator()(DrawAtlas* op) { this->make_texture(&op->atlas); } - void operator()(DrawImage* op) { this->make_texture(&op->image); } - void operator()(DrawImageNine* op) { this->make_texture(&op->image); } - void operator()(DrawImageRect* op) { this->make_texture(&op->image); } - void make_texture(sk_sp<const SkImage>* img) const { - *img = (*img)->makeTextureImage(fCtx); - } - - // Some ops have a paint, some have an optional paint. - // Either way, get back a pointer. - static SkPaint* AsPtr(SkPaint& p) { return &p; } - static SkPaint* AsPtr(SkRecords::Optional<SkPaint>& p) { return p; } - - // For all other types of ops, look for images inside the paint. - template <typename T> - SK_WHEN(T::kTags & kHasPaint_Tag, void) operator()(T* op) { - SkMatrix matrix; - SkShader::TileMode xy[2]; - - if (auto paint = AsPtr(op->paint)) - if (auto shader = paint->getShader()) - if (auto image = shader->isAImage(&matrix, xy)) { - paint->setShader(image->makeTextureImage(fCtx)->makeShader(xy[0], xy[1], &matrix)); - } - - // TODO: re-build compose shaders - } - - // Control ops, etc. Nothing to do for these. - template <typename T> - SK_WHEN(!(T::kTags & kHasPaint_Tag), void) operator()(T*) {} - }; - -} // namespace SkRecords - -static void optimize_for(GrContext* ctx, SkRecord* record) { - for (int i = 0; ctx && i < record->count(); i++) { - record->mutate(i, SkRecords::OptimizeFor{ctx}); - } -} SkPictureRecorder::SkPictureRecorder() { fActivelyRecording = false; @@ -112,7 +63,6 @@ sk_sp<SkPicture> SkPictureRecorder::finishRecordingAsPicture(uint32_t finishFlag // TODO: delay as much of this work until just before first playback? SkRecordOptimize(fRecord); - optimize_for(fGrContextToOptimizeFor, fRecord); if (fRecord->count() == 0) { if (finishFlags & kReturnNullForEmpty_FinishFlag) { @@ -173,7 +123,6 @@ sk_sp<SkDrawable> SkPictureRecorder::finishRecordingAsDrawable(uint32_t finishFl fRecorder->restoreToCount(1); // If we were missing any restores, add them now. SkRecordOptimize(fRecord); - optimize_for(fGrContextToOptimizeFor, fRecord); if (fRecord->count() == 0) { if (finishFlags & kReturnNullForEmpty_FinishFlag) { |