Erase cached mipmap levels after a long time of not being used
This commit is contained in:
parent
462443ed0a
commit
a69d9e3c6c
2 changed files with 18 additions and 4 deletions
|
|
@ -1,4 +1,5 @@
|
||||||
#include "ImageResourceDisplay.hpp"
|
#include "ImageResourceDisplay.hpp"
|
||||||
|
#include <chrono>
|
||||||
#include <include/codec/SkPngDecoder.h>
|
#include <include/codec/SkPngDecoder.h>
|
||||||
#include <include/codec/SkJpegDecoder.h>
|
#include <include/codec/SkJpegDecoder.h>
|
||||||
#include <include/codec/SkBmpDecoder.h>
|
#include <include/codec/SkBmpDecoder.h>
|
||||||
|
|
@ -57,6 +58,13 @@ bool ImageResourceDisplay::update_draw() const {
|
||||||
}
|
}
|
||||||
|
|
||||||
void ImageResourceDisplay::update(World& w) {
|
void ImageResourceDisplay::update(World& w) {
|
||||||
|
for(auto& frame : frames) {
|
||||||
|
std::erase_if(frame.mipmapLevels, [](const auto& mipmapPair) {
|
||||||
|
static constexpr std::chrono::duration TIME_TO_REMOVE_MIPMAP_CACHE = std::chrono::seconds(40);
|
||||||
|
return std::chrono::steady_clock::now() - mipmapPair.second.timeLastUsed > TIME_TO_REMOVE_MIPMAP_CACHE;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
mustUpdateDraw = false;
|
mustUpdateDraw = false;
|
||||||
if(!loadedFirstFrame && loadedFrames >= 1) {
|
if(!loadedFirstFrame && loadedFrames >= 1) {
|
||||||
mustUpdateDraw = true;
|
mustUpdateDraw = true;
|
||||||
|
|
@ -131,11 +139,13 @@ void ImageResourceDisplay::draw(SkCanvas* canvas, const DrawData& drawData, cons
|
||||||
|
|
||||||
SkImageInfo mipmapImgInfo = imageInfo.makeDimensions(mipmapResolution);
|
SkImageInfo mipmapImgInfo = imageInfo.makeDimensions(mipmapResolution);
|
||||||
sk_sp<SkImage> mipmapImage = frame.data->makeScaled(mipmapImgInfo, SkSamplingOptions(SkFilterMode::kLinear, SkMipmapMode::kNone));
|
sk_sp<SkImage> mipmapImage = frame.data->makeScaled(mipmapImgInfo, SkSamplingOptions(SkFilterMode::kLinear, SkMipmapMode::kNone));
|
||||||
frame.mipmapLevels.emplace(mipmapLevel, mipmapImage);
|
frame.mipmapLevels.emplace(mipmapLevel, MipmapLevelData{mipmapImage, std::chrono::steady_clock::now()});
|
||||||
canvas->drawImageRect(mipmapImage, imRect, {SkFilterMode::kLinear, SkMipmapMode::kNone});
|
canvas->drawImageRect(mipmapImage, imRect, {SkFilterMode::kLinear, SkMipmapMode::kNone});
|
||||||
}
|
}
|
||||||
else
|
else {
|
||||||
canvas->drawImageRect(mipmapIt->second, imRect, {SkFilterMode::kLinear, SkMipmapMode::kNone});
|
mipmapIt->second.timeLastUsed = std::chrono::steady_clock::now();
|
||||||
|
canvas->drawImageRect(mipmapIt->second.imageData, imRect, {SkFilterMode::kLinear, SkMipmapMode::kNone});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -16,10 +16,14 @@ class ImageResourceDisplay : public ResourceDisplay {
|
||||||
virtual Type get_type() const override;
|
virtual Type get_type() const override;
|
||||||
virtual ~ImageResourceDisplay() override;
|
virtual ~ImageResourceDisplay() override;
|
||||||
private:
|
private:
|
||||||
|
struct MipmapLevelData {
|
||||||
|
sk_sp<SkImage> imageData;
|
||||||
|
std::chrono::steady_clock::time_point timeLastUsed;
|
||||||
|
};
|
||||||
struct FrameData {
|
struct FrameData {
|
||||||
sk_sp<SkImage> data;
|
sk_sp<SkImage> data;
|
||||||
float duration;
|
float duration;
|
||||||
std::unordered_map<unsigned, sk_sp<SkImage>> mipmapLevels;
|
std::unordered_map<unsigned, MipmapLevelData> mipmapLevels;
|
||||||
};
|
};
|
||||||
std::vector<FrameData> frames;
|
std::vector<FrameData> frames;
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue