thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "GRAPHICS: Tentative fix saveScreenshot() warning for OpenGL"

Browse source 
This reverts commit 0f118d0210.
This commit is contained in:
Thierry Crozat 2021-04-06 17:46:39 +01:00
parent 74f20c23e1
commit 7408dee5df
3 changed files with 0 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

25
backends/graphics/opengl/opengl-graphics.h
View file

@ -265,31 +265,6 @@ protected:
*/ */
bool saveScreenshot(const Common::String &filename) const; bool saveScreenshot(const Common::String &filename) const;
/**
* @brief Dummy implementation of saveScreenshot() (ie. no file argument) for OpenGLGraphicsManager
*
* Currently we have a backend OpenGLSDLGraphicsManager, which inherits from both
* OpenGLGraphicsManager and SdlGraphicsManager
*
* OpenGLSDLGraphicsManager "implements" saveScreenshot(const Common::String &filename) (can be overridden)
* by calling the saveScreenshot(const Common::String &filename) of OpenGLGraphicsManager
* and saveScreenshot() by calling saveScreenshot() of SdlGraphicsManager
*
* SdlGraphicsManager provides an implementation of saveScreenshot() (which can be overridden)
* but a dummy implementation of saveScreenshot(const Common::String &filename)
*
* OpenGLGraphicsManager provides the implementation of saveScreenshot(const Common::String &filename)
* but needs a (dummy) implementation of saveScreenshot() since OpenGLGraphicsManager inherits from GraphicsManager
* This avoids the noisy warning (when building for OpenGL backend with no SDL support):
* OpenGL::OpenGLGraphicsManager::saveScreenshot
* hides overloaded virtual function
* GraphicsManager::saveScreenshot
*
*/
// TODO Maybe we should just unify these two method signatures in one
// to avoid this mess
void saveScreenshot() override { return; }
private: private:
// //
// OpenGL utilities // OpenGL utilities

4
backends/graphics/openglsdl/openglsdl-graphics.cpp
View file

@ -362,10 +362,6 @@ bool OpenGLSdlGraphicsManager::saveScreenshot(const Common::String &filename) co
return OpenGLGraphicsManager::saveScreenshot(filename); return OpenGLGraphicsManager::saveScreenshot(filename);
} }
void OpenGLSdlGraphicsManager::saveScreenshot() {
SdlGraphicsManager::saveScreenshot();
}
bool OpenGLSdlGraphicsManager::setupMode(uint width, uint height) { bool OpenGLSdlGraphicsManager::setupMode(uint width, uint height) {
// In case we request a fullscreen mode we will use the mode the user // In case we request a fullscreen mode we will use the mode the user
// has chosen last time or the biggest mode available. // has chosen last time or the biggest mode available.

1
backends/graphics/openglsdl/openglsdl-graphics.h
View file

@ -59,7 +59,6 @@ protected:
virtual void handleResizeImpl(const int width, const int height, const int xdpi, const int ydpi) override; virtual void handleResizeImpl(const int width, const int height, const int xdpi, const int ydpi) override;
virtual bool saveScreenshot(const Common::String &filename) const override; virtual bool saveScreenshot(const Common::String &filename) const override;
void saveScreenshot() override;
virtual int getGraphicsModeScale(int mode) const override { return 1; } virtual int getGraphicsModeScale(int mode) const override { return 1; }