[Scummvm-git-logs] scummvm branch-2-5 -> 4d70913389476599f6b7f0b2333d3e5cf7456f88

[criezy]

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:
5a51a91379 BACKENDS: PSP: Fix screen scaling
4d70913389 N64: Fix setting graphics modes


Commit: 5a51a91379baf20c615db328847dc92baddef6cb
    https://github.com/scummvm/scummvm/commit/5a51a91379baf20c615db328847dc92baddef6cb
Author: rsn8887 (rsn8887 at users.noreply.github.com)
Date: 2021-10-03T00:21:14+01:00

Commit Message:
BACKENDS: PSP: Fix screen scaling

Changed paths:
    backends/platform/psp/osys_psp.cpp
    backends/platform/psp/osys_psp.h


diff --git a/backends/platform/psp/osys_psp.cpp b/backends/platform/psp/osys_psp.cpp
index 4f7be25799..83f1fde1e3 100644
--- a/backends/platform/psp/osys_psp.cpp
+++ b/backends/platform/psp/osys_psp.cpp
@@ -135,7 +135,7 @@ int OSystem_PSP::getDefaultGraphicsMode() const {
 	return _displayManager.getDefaultGraphicsMode();
 }
 
-bool OSystem_PSP::setGraphicsMode(int mode) {
+bool OSystem_PSP::setGraphicsMode(int mode, uint flags) {
 	DEBUG_ENTER_FUNC();
 	_displayManager.waitUntilRenderFinished();
 	_pendingUpdate = false;
diff --git a/backends/platform/psp/osys_psp.h b/backends/platform/psp/osys_psp.h
index e203616356..d12be80944 100644
--- a/backends/platform/psp/osys_psp.h
+++ b/backends/platform/psp/osys_psp.h
@@ -73,7 +73,7 @@ public:
 	// Graphics related
 	const GraphicsMode *getSupportedGraphicsModes() const;
 	int getDefaultGraphicsMode() const;
-	bool setGraphicsMode(int mode);
+	bool setGraphicsMode(int mode, uint flags);
 	int getGraphicsMode() const;
 #ifdef USE_RGB_COLOR
 	virtual Graphics::PixelFormat getScreenFormat() const;


Commit: 4d70913389476599f6b7f0b2333d3e5cf7456f88
    https://github.com/scummvm/scummvm/commit/4d70913389476599f6b7f0b2333d3e5cf7456f88
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2021-10-03T00:21:35+01:00

Commit Message:
N64: Fix setting graphics modes

Changed paths:
    backends/platform/n64/osys_n64.h
    backends/platform/n64/osys_n64_base.cpp


diff --git a/backends/platform/n64/osys_n64.h b/backends/platform/n64/osys_n64.h
index 31de4563d6..b5cb45312c 100644
--- a/backends/platform/n64/osys_n64.h
+++ b/backends/platform/n64/osys_n64.h
@@ -146,7 +146,7 @@ public:
 	virtual bool getFeatureState(Feature f);
 	virtual const GraphicsMode *getSupportedGraphicsModes() const;
 	virtual int getDefaultGraphicsMode() const;
-	virtual bool setGraphicsMode(int mode);
+	virtual bool setGraphicsMode(int mode, uint flags = OSystem::kGfxModeNoFlags);
 	virtual int getGraphicsMode() const;
 	virtual void initSize(uint width, uint height, const Graphics::PixelFormat *format);
 	virtual int16 getHeight();
diff --git a/backends/platform/n64/osys_n64_base.cpp b/backends/platform/n64/osys_n64_base.cpp
index 3e4507f421..679e0c504c 100644
--- a/backends/platform/n64/osys_n64_base.cpp
+++ b/backends/platform/n64/osys_n64_base.cpp
@@ -225,7 +225,7 @@ int OSystem_N64::getDefaultGraphicsMode() const {
 	return OVERS_NTSC_340X240;
 }
 
-bool OSystem_N64::setGraphicsMode(int mode) {
+bool OSystem_N64::setGraphicsMode(int mode, uint /*flags*/) {
 	_graphicMode = mode;
 	switchGraphicModeId(_graphicMode);