From: Lars Hofhansl <larsh@apache.org>
Date: Sun, 5 Nov 2017 01:05:47 +0000 (-0700)
Subject: Do not scale texture unless necessary.
X-Git-Tag: 5.0.0~745
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=6be6fb78a4becc9bf4e999ff5aaa3c2d75fcc428;p=oweals%2Fminetest.git

Do not scale texture unless necessary.

This avoids scaling textures to 'texture_min_size' unless it is actually
required (because either auto-scaling or bi/trilinear filtering is enabled)
---

diff --git a/src/client/tile.cpp b/src/client/tile.cpp
index 9321a4586..d0b9d81bf 100644
--- a/src/client/tile.cpp
+++ b/src/client/tile.cpp
@@ -1777,7 +1777,8 @@ bool TextureSource::generateImagePart(std::string part_of_name,
 			 * mix high- and low-res textures, or for mods with least-common-denominator
 			 * textures that don't have the resources to offer high-res alternatives.
 			 */
-			s32 scaleto = g_settings->getS32("texture_min_size");
+			const bool filter = m_setting_trilinear_filter || m_setting_bilinear_filter;
+			const s32 scaleto = filter ? g_settings->getS32("texture_min_size") : 1;
 			if (scaleto > 1) {
 				const core::dimension2d<u32> dim = baseimg->getDimension();