[Scummvm-cvs-logs] SF.net SVN: scummvm:[49838] scummvm/trunk
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Tue Jun 15 14:21:08 CEST 2010
Revision: 49838
http://scummvm.svn.sourceforge.net/scummvm/?rev=49838&view=rev
Author: fingolfin
Date: 2010-06-15 12:21:08 +0000 (Tue, 15 Jun 2010)
Log Message:
-----------
SYSTEM: Unify OSystem::getSupportedFormats() signature
Modified Paths:
--------------
scummvm/trunk/backends/platform/dc/dc.h
scummvm/trunk/backends/platform/dc/display.cpp
scummvm/trunk/backends/platform/psp/display_manager.cpp
scummvm/trunk/backends/platform/psp/display_manager.h
scummvm/trunk/backends/platform/psp/osys_psp.cpp
scummvm/trunk/backends/platform/psp/osys_psp.h
scummvm/trunk/backends/platform/sdl/graphics.cpp
scummvm/trunk/backends/platform/sdl/sdl.h
scummvm/trunk/backends/platform/wii/osystem.h
scummvm/trunk/backends/platform/wii/osystem_gfx.cpp
scummvm/trunk/common/system.h
Modified: scummvm/trunk/backends/platform/dc/dc.h
===================================================================
--- scummvm/trunk/backends/platform/dc/dc.h 2010-06-15 12:20:24 UTC (rev 49837)
+++ scummvm/trunk/backends/platform/dc/dc.h 2010-06-15 12:21:08 UTC (rev 49838)
@@ -86,7 +86,7 @@
Graphics::PixelFormat getScreenFormat() const;
// Returns a list of all pixel formats supported by the backend.
- Common::List<Graphics::PixelFormat> getSupportedFormats();
+ Common::List<Graphics::PixelFormat> getSupportedFormats() const;
// Set the size of the video bitmap.
// Typically, 320x200
Modified: scummvm/trunk/backends/platform/dc/display.cpp
===================================================================
--- scummvm/trunk/backends/platform/dc/display.cpp 2010-06-15 12:20:24 UTC (rev 49837)
+++ scummvm/trunk/backends/platform/dc/display.cpp 2010-06-15 12:21:08 UTC (rev 49838)
@@ -198,7 +198,7 @@
return screenFormats[_screenFormat];
}
-Common::List<Graphics::PixelFormat> OSystem_Dreamcast::getSupportedFormats()
+Common::List<Graphics::PixelFormat> OSystem_Dreamcast::getSupportedFormats() const
{
Common::List<Graphics::PixelFormat> list;
unsigned i;
Modified: scummvm/trunk/backends/platform/psp/display_manager.cpp
===================================================================
--- scummvm/trunk/backends/platform/psp/display_manager.cpp 2010-06-15 12:20:24 UTC (rev 49837)
+++ scummvm/trunk/backends/platform/psp/display_manager.cpp 2010-06-15 12:21:08 UTC (rev 49838)
@@ -379,7 +379,7 @@
return true;
}
-Common::List<Graphics::PixelFormat> DisplayManager::getSupportedPixelFormats() {
+Common::List<Graphics::PixelFormat> DisplayManager::getSupportedPixelFormats() const {
Common::List<Graphics::PixelFormat> list;
// In order of preference
Modified: scummvm/trunk/backends/platform/psp/display_manager.h
===================================================================
--- scummvm/trunk/backends/platform/psp/display_manager.h 2010-06-15 12:20:24 UTC (rev 49837)
+++ scummvm/trunk/backends/platform/psp/display_manager.h 2010-06-15 12:21:08 UTC (rev 49838)
@@ -83,12 +83,12 @@
void setSizeAndPixelFormat(uint width, uint height, const Graphics::PixelFormat *format);
// Getters
- float getScaleX() { return _displayParams.scaleX; }
- float getScaleY() { return _displayParams.scaleY; }
- uint32 getOutputWidth() { return _displayParams.screenOutput.width; }
- uint32 getOutputHeight() { return _displayParams.screenOutput.height; }
- uint32 getOutputBitsPerPixel() { return _displayParams.outputBitsPerPixel; }
- Common::List<Graphics::PixelFormat> getSupportedPixelFormats();
+ float getScaleX() const { return _displayParams.scaleX; }
+ float getScaleY() const { return _displayParams.scaleY; }
+ uint32 getOutputWidth() const { return _displayParams.screenOutput.width; }
+ uint32 getOutputHeight() const { return _displayParams.screenOutput.height; }
+ uint32 getOutputBitsPerPixel() const { return _displayParams.outputBitsPerPixel; }
+ Common::List<Graphics::PixelFormat> getSupportedPixelFormats() const;
private:
struct GlobalDisplayParams {
Modified: scummvm/trunk/backends/platform/psp/osys_psp.cpp
===================================================================
--- scummvm/trunk/backends/platform/psp/osys_psp.cpp 2010-06-15 12:20:24 UTC (rev 49837)
+++ scummvm/trunk/backends/platform/psp/osys_psp.cpp 2010-06-15 12:21:08 UTC (rev 49838)
@@ -148,7 +148,7 @@
return _screen.getScummvmPixelFormat();
}
-Common::List<Graphics::PixelFormat> OSystem_PSP::getSupportedFormats() {
+Common::List<Graphics::PixelFormat> OSystem_PSP::getSupportedFormats() const {
return _displayManager.getSupportedPixelFormats();
}
Modified: scummvm/trunk/backends/platform/psp/osys_psp.h
===================================================================
--- scummvm/trunk/backends/platform/psp/osys_psp.h 2010-06-15 12:20:24 UTC (rev 49837)
+++ scummvm/trunk/backends/platform/psp/osys_psp.h 2010-06-15 12:21:08 UTC (rev 49838)
@@ -87,7 +87,7 @@
int getGraphicsMode() const;
#ifdef USE_RGB_COLOR
virtual Graphics::PixelFormat getScreenFormat() const;
- virtual Common::List<Graphics::PixelFormat> getSupportedFormats();
+ virtual Common::List<Graphics::PixelFormat> getSupportedFormats() const;
#endif
// Screen size
Modified: scummvm/trunk/backends/platform/sdl/graphics.cpp
===================================================================
--- scummvm/trunk/backends/platform/sdl/graphics.cpp 2010-06-15 12:20:24 UTC (rev 49837)
+++ scummvm/trunk/backends/platform/sdl/graphics.cpp 2010-06-15 12:21:08 UTC (rev 49838)
@@ -243,7 +243,7 @@
};
// TODO: prioritize matching alpha masks
-Common::List<Graphics::PixelFormat> OSystem_SDL::getSupportedFormats() {
+Common::List<Graphics::PixelFormat> OSystem_SDL::getSupportedFormats() const {
static Common::List<Graphics::PixelFormat> list;
static bool inited = false;
Modified: scummvm/trunk/backends/platform/sdl/sdl.h
===================================================================
--- scummvm/trunk/backends/platform/sdl/sdl.h 2010-06-15 12:20:24 UTC (rev 49837)
+++ scummvm/trunk/backends/platform/sdl/sdl.h 2010-06-15 12:21:08 UTC (rev 49838)
@@ -98,7 +98,7 @@
virtual Graphics::PixelFormat getScreenFormat() const { return _screenFormat; }
// Highest supported
- virtual Common::List<Graphics::PixelFormat> getSupportedFormats();
+ virtual Common::List<Graphics::PixelFormat> getSupportedFormats() const;
#endif
// Set the size and format of the video bitmap.
Modified: scummvm/trunk/backends/platform/wii/osystem.h
===================================================================
--- scummvm/trunk/backends/platform/wii/osystem.h 2010-06-15 12:20:24 UTC (rev 49837)
+++ scummvm/trunk/backends/platform/wii/osystem.h 2010-06-15 12:21:08 UTC (rev 49838)
@@ -156,7 +156,7 @@
virtual bool setGraphicsMode(int mode);
#ifdef USE_RGB_COLOR
virtual Graphics::PixelFormat getScreenFormat() const;
- virtual Common::List<Graphics::PixelFormat> getSupportedFormats();
+ virtual Common::List<Graphics::PixelFormat> getSupportedFormats() const;
#endif
virtual int getGraphicsMode() const;
virtual void initSize(uint width, uint height,
Modified: scummvm/trunk/backends/platform/wii/osystem_gfx.cpp
===================================================================
--- scummvm/trunk/backends/platform/wii/osystem_gfx.cpp 2010-06-15 12:20:24 UTC (rev 49837)
+++ scummvm/trunk/backends/platform/wii/osystem_gfx.cpp 2010-06-15 12:21:08 UTC (rev 49838)
@@ -209,7 +209,7 @@
return _pfGame;
}
-Common::List<Graphics::PixelFormat> OSystem_Wii::getSupportedFormats() {
+Common::List<Graphics::PixelFormat> OSystem_Wii::getSupportedFormats() const {
Common::List<Graphics::PixelFormat> res;
res.push_back(_pfRGB565);
res.push_back(Graphics::PixelFormat::createFormatCLUT8());
Modified: scummvm/trunk/common/system.h
===================================================================
--- scummvm/trunk/common/system.h 2010-06-15 12:20:24 UTC (rev 49837)
+++ scummvm/trunk/common/system.h 2010-06-15 12:21:08 UTC (rev 49838)
@@ -383,7 +383,7 @@
* @note Backends supporting RGB color should accept game data in RGB color
* order, even if hardware uses BGR or some other color order.
*/
- virtual Common::List<Graphics::PixelFormat> getSupportedFormats() = 0;
+ virtual Common::List<Graphics::PixelFormat> getSupportedFormats() const = 0;
#else
inline Graphics::PixelFormat getScreenFormat() const {
return Graphics::PixelFormat::createFormatCLUT8();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list