Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hide the ResourceKey.h from the public APIs of tgfx. #2083

Merged
merged 1 commit into from
Jan 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
},
{
"url": "${PAG_GROUP}/tgfx.git",
"commit": "9ad584b3b86df66ce03e6393fbf19e47296d6f57",
"commit": "d864aeeb6184c97664bfaec7a164a22d4ab723b7",
"dir": "third_party/tgfx"
},
{
Expand Down
2 changes: 1 addition & 1 deletion src/rendering/caches/RenderCache.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ void RenderCache::detachFromContext() {
clearExpiredDecodedImages();
clearExpiredSnapshots();
if (!timestamps.empty()) {
// Always purge scratch resources that haven't been used in 1 frame.
// Always purge recycled resources that haven't been used in 1 frame.
context->purgeResourcesNotUsedSince(timestamps.back(), true);
}
if (context->memoryUsage() + graphicsMemory > PURGEABLE_GRAPHICS_MEMORY &&
Expand Down
4 changes: 2 additions & 2 deletions src/rendering/video/SoftwareDecoderWrapper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ class SoftwareI420Data : public tgfx::YUVData {
return data.size();
}

const void* getBaseAddressAt(int planeIndex) const override {
const void* getBaseAddressAt(size_t planeIndex) const override {
return data[planeIndex];
}

size_t getRowBytesAt(int planeIndex) const override {
size_t getRowBytesAt(size_t planeIndex) const override {
return rowBytes[planeIndex];
}

Expand Down