diff options
Diffstat (limited to 'backends')
-rw-r--r-- | backends/graphics/graphics.h | 13 | ||||
-rw-r--r-- | backends/graphics/null/null-graphics.h | 7 | ||||
-rw-r--r-- | backends/graphics/opengl/opengl-graphics.h | 2 | ||||
-rw-r--r-- | backends/platform/3ds/osystem-graphics.cpp | 20 | ||||
-rw-r--r-- | backends/platform/3ds/osystem.h | 15 | ||||
-rw-r--r-- | backends/platform/dc/dc.h | 12 | ||||
-rw-r--r-- | backends/platform/dc/display.cpp | 26 | ||||
-rw-r--r-- | backends/platform/ds/arm9/source/osystem_ds.cpp | 17 | ||||
-rw-r--r-- | backends/platform/ds/arm9/source/osystem_ds.h | 8 | ||||
-rw-r--r-- | backends/platform/ps2/systemps2.cpp | 18 | ||||
-rw-r--r-- | backends/platform/ps2/systemps2.h | 4 |
11 files changed, 8 insertions, 134 deletions
diff --git a/backends/graphics/graphics.h b/backends/graphics/graphics.h index df4fb6a9e2..2f6cd0550f 100644 --- a/backends/graphics/graphics.h +++ b/backends/graphics/graphics.h @@ -42,11 +42,14 @@ public: virtual void setFeatureState(OSystem::Feature f, bool enable) = 0; virtual bool getFeatureState(OSystem::Feature f) const = 0; - virtual const OSystem::GraphicsMode *getSupportedGraphicsModes() const = 0; - virtual int getDefaultGraphicsMode() const = 0; - virtual bool setGraphicsMode(int mode) = 0; - virtual void resetGraphicsScale() = 0; - virtual int getGraphicsMode() const = 0; + virtual const OSystem::GraphicsMode *getSupportedGraphicsModes() const { + static const OSystem::GraphicsMode noGraphicsModes[] = {{"NONE", "Normal", 0}, {nullptr, nullptr, 0 }}; + return noGraphicsModes; + }; + virtual int getDefaultGraphicsMode() const { return 0; } + virtual bool setGraphicsMode(int mode) { return (mode == 0); } + virtual void resetGraphicsScale() {} + virtual int getGraphicsMode() const { return 0; } virtual const OSystem::GraphicsMode *getSupportedShaders() const { static const OSystem::GraphicsMode no_shader[2] = {{"NONE", "Normal (no shader)", 0}, {0, 0, 0}}; return no_shader; diff --git a/backends/graphics/null/null-graphics.h b/backends/graphics/null/null-graphics.h index 3972904578..d050e98a03 100644 --- a/backends/graphics/null/null-graphics.h +++ b/backends/graphics/null/null-graphics.h @@ -25,8 +25,6 @@ #include "backends/graphics/graphics.h" -static const OSystem::GraphicsMode s_noGraphicsModes[] = { {0, 0, 0} }; - class NullGraphicsManager : public GraphicsManager { public: virtual ~NullGraphicsManager() {} @@ -35,11 +33,6 @@ public: void setFeatureState(OSystem::Feature f, bool enable) override {} bool getFeatureState(OSystem::Feature f) const override { return false; } - const OSystem::GraphicsMode *getSupportedGraphicsModes() const override { return s_noGraphicsModes; } - int getDefaultGraphicsMode() const override { return 0; } - bool setGraphicsMode(int mode) override { return true; } - void resetGraphicsScale() override {} - int getGraphicsMode() const override { return 0; } inline Graphics::PixelFormat getScreenFormat() const override { return Graphics::PixelFormat::createFormatCLUT8(); } diff --git a/backends/graphics/opengl/opengl-graphics.h b/backends/graphics/opengl/opengl-graphics.h index 322f1d8017..e849c017b4 100644 --- a/backends/graphics/opengl/opengl-graphics.h +++ b/backends/graphics/opengl/opengl-graphics.h @@ -68,8 +68,6 @@ public: virtual bool setGraphicsMode(int mode) override; virtual int getGraphicsMode() const override; - virtual void resetGraphicsScale() override {} - #ifdef USE_RGB_COLOR virtual Graphics::PixelFormat getScreenFormat() const override; virtual Common::List<Graphics::PixelFormat> getSupportedFormats() const override; diff --git a/backends/platform/3ds/osystem-graphics.cpp b/backends/platform/3ds/osystem-graphics.cpp index e1170a96d5..95b30193f7 100644 --- a/backends/platform/3ds/osystem-graphics.cpp +++ b/backends/platform/3ds/osystem-graphics.cpp @@ -124,26 +124,6 @@ bool OSystem_3DS::getFeatureState(OSystem::Feature f) { } } -const OSystem::GraphicsMode * -OSystem_3DS::getSupportedGraphicsModes() const { - return s_graphicsModes; -} - -int OSystem_3DS::getDefaultGraphicsMode() const { - return GFX_LINEAR; -} - -bool OSystem_3DS::setGraphicsMode(int mode) { - return true; -} - -void OSystem_3DS::resetGraphicsScale() { - debug("resetGraphicsScale"); -} - -int OSystem_3DS::getGraphicsMode() const { - return GFX_LINEAR; -} void OSystem_3DS::initSize(uint width, uint height, const Graphics::PixelFormat *format) { debug("3ds initsize w:%d h:%d", width, height); diff --git a/backends/platform/3ds/osystem.h b/backends/platform/3ds/osystem.h index d6d667dc91..e38579a536 100644 --- a/backends/platform/3ds/osystem.h +++ b/backends/platform/3ds/osystem.h @@ -39,11 +39,6 @@ namespace _3DS { -enum { - GFX_LINEAR = 0, - GFX_NEAREST = 1 -}; - enum MagnifyMode { MODE_MAGON, MODE_MAGOFF, @@ -54,11 +49,6 @@ enum InputMode { MODE_DRAG, }; -static const OSystem::GraphicsMode s_graphicsModes[] = { - {"default", "Default Test", GFX_LINEAR}, - { 0, 0, 0 } -}; - class OSystem_3DS : public EventsBaseBackend, public PaletteManager { public: OSystem_3DS(); @@ -96,11 +86,6 @@ public: void addSysArchivesToSearchSet(Common::SearchSet &s, int priority) override; // Graphics - virtual const OSystem::GraphicsMode *getSupportedGraphicsModes() const; - int getDefaultGraphicsMode() const; - bool setGraphicsMode(int mode); - void resetGraphicsScale(); - int getGraphicsMode() const; inline Graphics::PixelFormat getScreenFormat() const { return _pfGame; } virtual Common::List<Graphics::PixelFormat> getSupportedFormats() const; void initSize(uint width, uint height, diff --git a/backends/platform/dc/dc.h b/backends/platform/dc/dc.h index 20098a5e2e..ef47449365 100644 --- a/backends/platform/dc/dc.h +++ b/backends/platform/dc/dc.h @@ -89,18 +89,6 @@ class OSystem_Dreamcast : private DCHardware, public EventsBaseBackend, public P // Query the state of the specified feature. bool getFeatureState(Feature f); - // Retrieve a list of all graphics modes supported by this backend. - const GraphicsMode *getSupportedGraphicsModes() const; - - // Return the ID of the 'default' graphics mode. - int getDefaultGraphicsMode() const; - - // Switch to the specified graphics mode. - bool setGraphicsMode(int mode); - - // Determine which graphics mode is currently active. - int getGraphicsMode() const; - // Set colors of the palette PaletteManager *getPaletteManager() { return this; } protected: diff --git a/backends/platform/dc/display.cpp b/backends/platform/dc/display.cpp index ffe9e5472a..e197d88019 100644 --- a/backends/platform/dc/display.cpp +++ b/backends/platform/dc/display.cpp @@ -682,32 +682,6 @@ void OSystem_Dreamcast::copyRectToOverlay(const void *buf, int pitch, _overlay_dirty = true; } - -static const OSystem::GraphicsMode gfxmodes[] = { - { "default", "640x480 16bpp", 0 }, - { NULL, NULL, 0 } -}; - -const OSystem::GraphicsMode *OSystem_Dreamcast::getSupportedGraphicsModes() const -{ - return gfxmodes; -} - -int OSystem_Dreamcast::getDefaultGraphicsMode() const -{ - return 0; -} - -bool OSystem_Dreamcast::setGraphicsMode(int mode) -{ - return mode == 0; -} - -int OSystem_Dreamcast::getGraphicsMode() const -{ - return 0; -} - Graphics::Surface *OSystem_Dreamcast::lockScreen() { if (!screen) diff --git a/backends/platform/ds/arm9/source/osystem_ds.cpp b/backends/platform/ds/arm9/source/osystem_ds.cpp index a387f0a694..fd3606d250 100644 --- a/backends/platform/ds/arm9/source/osystem_ds.cpp +++ b/backends/platform/ds/arm9/source/osystem_ds.cpp @@ -162,23 +162,6 @@ bool OSystem_DS::getFeatureState(Feature f) { return false; } -const OSystem::GraphicsMode *OSystem_DS::getSupportedGraphicsModes() const { - return s_supportedGraphicsModes; -} - - -int OSystem_DS::getDefaultGraphicsMode() const { - return 0; -} - -bool OSystem_DS::setGraphicsMode(int mode) { - return true; -} - -int OSystem_DS::getGraphicsMode() const { - return -1; -} - void OSystem_DS::initSize(uint width, uint height, const Graphics::PixelFormat *format) { // For Lost in Time, the title screen is displayed in 640x400. // In order to support this game, the screen mode is set, but diff --git a/backends/platform/ds/arm9/source/osystem_ds.h b/backends/platform/ds/arm9/source/osystem_ds.h index 5db644bed5..6fb8116bec 100644 --- a/backends/platform/ds/arm9/source/osystem_ds.h +++ b/backends/platform/ds/arm9/source/osystem_ds.h @@ -84,10 +84,6 @@ public: virtual bool hasFeature(Feature f); virtual void setFeatureState(Feature f, bool enable); virtual bool getFeatureState(Feature f); - virtual const GraphicsMode *getSupportedGraphicsModes() const; - virtual int getDefaultGraphicsMode() const; - virtual bool setGraphicsMode(int mode); - virtual int getGraphicsMode() const; virtual void initSize(uint width, uint height, const Graphics::PixelFormat *format); virtual int16 getHeight(); virtual int16 getWidth(); @@ -183,8 +179,4 @@ public: void engineDone(); }; -static const OSystem::GraphicsMode s_supportedGraphicsModes[] = { - {0, 0, 0}, -}; - #endif diff --git a/backends/platform/ps2/systemps2.cpp b/backends/platform/ps2/systemps2.cpp index a9fc71c90a..4231297888 100644 --- a/backends/platform/ps2/systemps2.cpp +++ b/backends/platform/ps2/systemps2.cpp @@ -792,24 +792,6 @@ void OSystem_PS2::unlockScreen(void) { _screen->unlockScreen(); } -const OSystem::GraphicsMode OSystem_PS2::_graphicsMode = { NULL, NULL, 0 }; - -const OSystem::GraphicsMode *OSystem_PS2::getSupportedGraphicsModes(void) const { - return &_graphicsMode; -} - -bool OSystem_PS2::setGraphicsMode(int mode) { - return (mode == 0); -} - -int OSystem_PS2::getGraphicsMode(void) const { - return 0; -} - -int OSystem_PS2::getDefaultGraphicsMode(void) const { - return 0; -} - bool OSystem_PS2::pollEvent(Common::Event &event) { bool res; diff --git a/backends/platform/ps2/systemps2.h b/backends/platform/ps2/systemps2.h index e11d320d78..ea7acfa4f0 100644 --- a/backends/platform/ps2/systemps2.h +++ b/backends/platform/ps2/systemps2.h @@ -95,10 +95,6 @@ public: virtual void unlockMutex(MutexRef mutex); virtual void deleteMutex(MutexRef mutex); - virtual const GraphicsMode *getSupportedGraphicsModes() const; - virtual int getDefaultGraphicsMode() const; - virtual bool setGraphicsMode(int mode); - virtual int getGraphicsMode() const; virtual int getScreenChangeID() const { return _screenChangeCount; } virtual void quit(); |