[Scummvm-git-logs] scummvm master -> 478fbbbe9ba3272664d775d9e5131387adbaca8a

[criezy]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
478fbbbe9b SDL: Fix the default scale factor for high resolution games


Commit: 478fbbbe9ba3272664d775d9e5131387adbaca8a
    https://github.com/scummvm/scummvm/commit/478fbbbe9ba3272664d775d9e5131387adbaca8a
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2021-08-26T18:32:21+01:00

Commit Message:
SDL: Fix the default scale factor for high resolution games

This fixes bug #12847: HQ filter broken when applied as a global setting

Changed paths:
    backends/graphics/surfacesdl/surfacesdl-graphics.cpp


diff --git a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
index 456d8f1755..7bb4393957 100644
--- a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
+++ b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
@@ -717,7 +717,8 @@ void SurfaceSdlGraphicsManager::initSize(uint w, uint h, const Graphics::PixelFo
 	if ((int)w != _videoMode.screenWidth || (int)h != _videoMode.screenHeight) {
 		const bool useDefault = defaultGraphicsModeConfig();
 		if (useDefault && w > 320) {
-			setScaler(_videoMode.scalerIndex, 1);
+			// Only the normal scaler has a 1x mode
+			setScaler(ScalerMan.findScalerPluginIndex("normal"), 1);
 		} else {
 			setScaler(_videoMode.scalerIndex, ConfMan.getInt("scale_factor"));
 		}