Skip to content

Commit

Permalink
Merge pull request #14078 from unknownbrackets/ppge-alloc
Browse files Browse the repository at this point in the history
PPGe: Decimate text images properly
  • Loading branch information
hrydgard authored Feb 8, 2021
2 parents 76a568a + c87b53a commit b539ce8
Showing 1 changed file with 15 additions and 10 deletions.
25 changes: 15 additions & 10 deletions Core/Util/PPGeDraw.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,8 @@ void PPGePrepareText(const char *text, float x, float y, PPGeAlign align, float
// Clears the buffer and state when done.
void PPGeDrawCurrentText(u32 color = 0xFFFFFFFF);

static void PPGeDecimateTextImages(int age = 97);

void PPGeSetTexture(u32 dataAddr, int width, int height);

//only 0xFFFFFF of data is used
Expand Down Expand Up @@ -910,6 +912,18 @@ static void PPGeDrawTextImage(PPGeTextDrawerImage im, float x, float y, const PP
PPGeSetDefaultTexture();
}

static void PPGeDecimateTextImages(int age) {
// Do this always, in case the platform has no TextDrawer but save state did.
for (auto it = textDrawerImages.begin(); it != textDrawerImages.end(); ) {
if (gpuStats.numFlips - it->second.entry.lastUsedFrame >= age) {
kernelMemory.Free(it->second.ptr);
it = textDrawerImages.erase(it);
} else {
++it;
}
}
}

void PPGeDrawText(const char *text, float x, float y, const PPGeStyle &style) {
if (!text || !strlen(text)) {
return;
Expand Down Expand Up @@ -1308,15 +1322,6 @@ void PPGeNotifyFrame() {
textDrawer->OncePerFrame();
}

// Do this always, in case the platform has no TextDrawer but save state did.
for (auto it = textDrawerImages.begin(); it != textDrawerImages.end(); ) {
if (it->second.entry.lastUsedFrame - gpuStats.numFlips >= 97) {
kernelMemory.Free(it->second.ptr);
it = textDrawerImages.erase(it);
} else {
++it;
}
}

PPGeDecimateTextImages();
PPGeImage::Decimate();
}

0 comments on commit b539ce8

Please sign in to comment.