[Scummvm-git-logs] scummvm master -> a24194b4c9abfa2c7a46fa0ea80cd81cc88330b8

[ccawley2011]

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:
a42188fddd SDL: Remove unused variable
a24194b4c9 BACKENDS: Add missing function to ModularGraphicsBackend


Commit: a42188fddd53f4c8c7b35be0bd19ebc0686f177c
    https://github.com/scummvm/scummvm/commit/a42188fddd53f4c8c7b35be0bd19ebc0686f177c
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2020-10-15T12:54:41+01:00

Commit Message:
SDL: Remove unused variable

Changed paths:
    backends/graphics3d/openglsdl/openglsdl-graphics3d.cpp
    backends/graphics3d/openglsdl/openglsdl-graphics3d.h


diff --git a/backends/graphics3d/openglsdl/openglsdl-graphics3d.cpp b/backends/graphics3d/openglsdl/openglsdl-graphics3d.cpp
index 4b6c72d3a2..85fd788bd5 100644
--- a/backends/graphics3d/openglsdl/openglsdl-graphics3d.cpp
+++ b/backends/graphics3d/openglsdl/openglsdl-graphics3d.cpp
@@ -289,8 +289,6 @@ void OpenGLSdlGraphics3dManager::createOrUpdateScreen() {
 	_overlayFormat = OpenGL::TextureGL::getRGBAPixelFormat();
 	_overlayScreen = new OpenGL::TiledSurface(obtainedWidth, obtainedHeight, _overlayFormat);
 
-	_screenFormat = _overlayFormat;
-
 	_screenChangeCount++;
 
 #if !defined(AMIGAOS) && !defined(__MORPHOS__)
diff --git a/backends/graphics3d/openglsdl/openglsdl-graphics3d.h b/backends/graphics3d/openglsdl/openglsdl-graphics3d.h
index c36d0b3e1d..1c5977c20d 100644
--- a/backends/graphics3d/openglsdl/openglsdl-graphics3d.h
+++ b/backends/graphics3d/openglsdl/openglsdl-graphics3d.h
@@ -74,7 +74,7 @@ public:
 
 	// GraphicsManager API - Graphics mode
 #ifdef USE_RGB_COLOR
-	virtual Graphics::PixelFormat getScreenFormat() const override { return _screenFormat; }
+	virtual Graphics::PixelFormat getScreenFormat() const override { return _overlayFormat; }
 #endif
 	virtual int getScreenChangeID() const override { return _screenChangeCount; }
 	virtual void initSize(uint w, uint h, const Graphics::PixelFormat *format) override;
@@ -156,9 +156,6 @@ protected:
 	OpenGL::SurfaceRenderer *_surfaceRenderer;
 
 	Graphics::PixelFormat _overlayFormat;
-#ifdef USE_RGB_COLOR
-	Graphics::PixelFormat _screenFormat;
-#endif
 
 	void initializeOpenGLContext() const;
 	void drawOverlay();


Commit: a24194b4c9abfa2c7a46fa0ea80cd81cc88330b8
    https://github.com/scummvm/scummvm/commit/a24194b4c9abfa2c7a46fa0ea80cd81cc88330b8
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2020-10-15T12:56:45+01:00

Commit Message:
BACKENDS: Add missing function to ModularGraphicsBackend

Fixes Trac #11778

Changed paths:
    backends/modular-backend.cpp
    backends/modular-backend.h


diff --git a/backends/modular-backend.cpp b/backends/modular-backend.cpp
index fc56b8f9fe..77b018ec05 100644
--- a/backends/modular-backend.cpp
+++ b/backends/modular-backend.cpp
@@ -261,6 +261,10 @@ void ModularGraphicsBackend::displayActivityIconOnOSD(const Graphics::Surface *i
 	_graphicsManager->displayActivityIconOnOSD(icon);
 }
 
+void ModularGraphicsBackend::saveScreenshot() {
+	_graphicsManager->saveScreenshot();
+}
+
 
 ModularMixerBackend::ModularMixerBackend()
 	:
diff --git a/backends/modular-backend.h b/backends/modular-backend.h
index eb9cce1622..bac5cf6321 100644
--- a/backends/modular-backend.h
+++ b/backends/modular-backend.h
@@ -114,7 +114,7 @@ public:
 	virtual void warpMouse(int x, int y) override final;
 	virtual void setMouseCursor(const void *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, bool dontScale = false, const Graphics::PixelFormat *format = NULL) override final;
 	virtual void setCursorPalette(const byte *colors, uint start, uint num) override final;
-	virtual bool lockMouse(bool lock) override;
+	virtual bool lockMouse(bool lock) override final;
 
 	//@}
 
@@ -124,6 +124,8 @@ public:
 	virtual void displayMessageOnOSD(const Common::U32String &msg) override final;
 	virtual void displayActivityIconOnOSD(const Graphics::Surface *icon) override final;
 
+	virtual void saveScreenshot() override final;
+
 	//@}
 
 protected: