Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2024-11-27 18:13:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Cap iterations of imageCleanTransparent sanely

Browse Source 
fixes #11513 performance regression with 256x textures
This commit is contained in:
sfan5 2021-08-15 14:46:45 +02:00
parent 963fbd1572
commit 4419e311a9
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/client/imagefilters.cpp
View File

@ -95,9 +95,14 @@ void imageCleanTransparent(video::IImage *src, u32 threshold)
Bitmap newmap = bitmap; Bitmap newmap = bitmap;
// Cap iterations to keep runtime reasonable, for higher-res textures we can
// get away with filling less pixels.
int iter_max = 11 - std::max(dim.Width, dim.Height) / 16;
iter_max = std::max(iter_max, 2);
// Then repeatedly look for transparent pixels, filling them in until // Then repeatedly look for transparent pixels, filling them in until
// we're finished (capped at 50 iterations). // we're finished.
for (u32 iter = 0; iter < 50; iter++) { for (u32 iter = 0; iter < iter_max; iter++) {
for (u32 ctry = 0; ctry < dim.Height; ctry++) for (u32 ctry = 0; ctry < dim.Height; ctry++)
for (u32 ctrx = 0; ctrx < dim.Width; ctrx++) { for (u32 ctrx = 0; ctrx < dim.Width; ctrx++) {