[Scummvm-git-logs] scummvm master -> 50eb0383127b141f984aaeebd5cf51a4856dc1c3

[antoniou79]

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

Summary:
50d2ae3b4c OPENGL: Use nearest neighbor scaling for overlay UI when filtering is disabled
50eb038312 ANDROID: Comment about related bug report for transient config options


Commit: 50d2ae3b4c8609e33187c1ec91a9dfec80cd819a
    https://github.com/scummvm/scummvm/commit/50d2ae3b4c8609e33187c1ec91a9dfec80cd819a
Author: antoniou (a.antoniou79 at gmail.com)
Date: 2020-10-02T12:38:46+03:00

Commit Message:
OPENGL: Use nearest neighbor scaling for overlay UI when filtering is disabled

User choice in launcher's Option, Graphics Tab detemines whether filtered graphics should be used

This now affects the ScummVM UI (it was previously set to not affect the UI overlay for OPENGL)

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


diff --git a/backends/graphics/opengl/opengl-graphics.cpp b/backends/graphics/opengl/opengl-graphics.cpp
index 8af87abcc2..a38b51c09b 100644
--- a/backends/graphics/opengl/opengl-graphics.cpp
+++ b/backends/graphics/opengl/opengl-graphics.cpp
@@ -124,6 +124,13 @@ void OpenGLGraphicsManager::setFeatureState(OSystem::Feature f, bool enable) {
 			_cursor->enableLinearFiltering(enable);
 		}
 
+		// The overlay UI should also obey the filtering choice (managed via the Filter Graphics checkbox in Graphics Tab).
+		// Thus, when overlay filtering is disabled, scaling in OPENGL is done with GL_NEAREST (nearest neighbor scaling).
+		// It may look crude, but it should be crispier and it's left to user choice to enable filtering.
+		if (_overlay) {
+			_overlay->enableLinearFiltering(enable);
+		}
+
 		break;
 
 	case OSystem::kFeatureCursorPalette:
@@ -958,10 +965,14 @@ void OpenGLGraphicsManager::handleResizeImpl(const int width, const int height,
 
 		_overlay = createSurface(_defaultFormatAlpha);
 		assert(_overlay);
-		// We always filter the overlay with GL_LINEAR. This assures it's
-		// readable in case it needs to be scaled and does not affect it
-		// otherwise.
-		_overlay->enableLinearFiltering(true);
+		// We should NOT always filter the overlay with GL_LINEAR. 
+		// In previous versions we always did use GL_LINEAR to assure the UI
+		// would be readable in case it needed to be scaled -- it would not affect it otherwise.
+		// However in modern devices due to larger screen size the UI display looks blurry
+		// when using the linear filtering scaling, and we got bug report(s) for it.
+		//   eg. https://bugs.scummvm.org/ticket/11742
+		// So, we now respect the choice for "Filter Graphics" made via ScummVM GUI (under Graphics Tab)
+		_overlay->enableLinearFiltering(_currentState.filtering);
 	}
 	_overlay->allocate(overlayWidth, overlayHeight);
 	_overlay->fill(0);


Commit: 50eb0383127b141f984aaeebd5cf51a4856dc1c3
    https://github.com/scummvm/scummvm/commit/50eb0383127b141f984aaeebd5cf51a4856dc1c3
Author: antoniou (a.antoniou79 at gmail.com)
Date: 2020-10-02T12:42:06+03:00

Commit Message:
ANDROID: Comment about related bug report for transient config options

Changed paths:
    backends/platform/android/android.cpp


diff --git a/backends/platform/android/android.cpp b/backends/platform/android/android.cpp
index 8ffa7cd63f..e10395e760 100644
--- a/backends/platform/android/android.cpp
+++ b/backends/platform/android/android.cpp
@@ -349,6 +349,10 @@ void OSystem_Android::initBackend() {
 	// BUG: "transient" ConfMan settings get nuked by the options
 	// screen. Passing the savepath in this way makes it stick
 	// (via ConfMan.registerDefault)
+	// Note: The aforementioned bug is probably the one reported here:
+	//  https://bugs.scummvm.org/ticket/3712
+	//  and maybe here:
+	//  https://bugs.scummvm.org/ticket/7389
 	// TODO is this right to save full path?
 	_savefileManager = new DefaultSaveFileManager(ConfMan.get("savepath"));
 	// TODO remove the debug message eventually