[Scummvm-cvs-logs] SF.net SVN: scummvm:[45973] scummvm/trunk/backends/platform/ps2

[fingolfin at users.sourceforge.net]

Revision: 45973
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45973&view=rev
Author:   fingolfin
Date:     2009-11-18 13:59:36 +0000 (Wed, 18 Nov 2009)

Log Message:
-----------
PS2: Remove custom OSystem::fillScreen implementation as well as clearScreen()

Modified Paths:
--------------
    scummvm/trunk/backends/platform/ps2/Gs2dScreen.cpp
    scummvm/trunk/backends/platform/ps2/Gs2dScreen.h
    scummvm/trunk/backends/platform/ps2/systemps2.cpp
    scummvm/trunk/backends/platform/ps2/systemps2.h

Modified: scummvm/trunk/backends/platform/ps2/Gs2dScreen.cpp
===================================================================
--- scummvm/trunk/backends/platform/ps2/Gs2dScreen.cpp	2009-11-18 11:16:50 UTC (rev 45972)
+++ scummvm/trunk/backends/platform/ps2/Gs2dScreen.cpp	2009-11-18 13:59:36 UTC (rev 45973)
@@ -391,20 +391,6 @@
 	}
 }
 
-void Gs2dScreen::clearScreen(void) {
-	WaitSema(g_DmacSema);
-	memset(_screenBuf, 0, _width * _height);
-	_screenChanged = true;
-	SignalSema(g_DmacSema);
-}
-
-void Gs2dScreen::fillScreen(uint32 col) {
-	WaitSema(g_DmacSema);
-	memset(_screenBuf, col, _width * _height);
-	_screenChanged = true;
-	SignalSema(g_DmacSema);
-}
-
 Graphics::Surface *Gs2dScreen::lockScreen() {
 	WaitSema(g_DmacSema);
 

Modified: scummvm/trunk/backends/platform/ps2/Gs2dScreen.h
===================================================================
--- scummvm/trunk/backends/platform/ps2/Gs2dScreen.h	2009-11-18 11:16:50 UTC (rev 45972)
+++ scummvm/trunk/backends/platform/ps2/Gs2dScreen.h	2009-11-18 13:59:36 UTC (rev 45973)
@@ -60,8 +60,6 @@
 
 	void copyPrintfOverlay(const uint8* buf);
 	void clearPrintfOverlay(void);
-	void clearScreen(void);
-	void fillScreen(uint32 col);
 
 	Graphics::Surface *lockScreen();
 	void unlockScreen();

Modified: scummvm/trunk/backends/platform/ps2/systemps2.cpp
===================================================================
--- scummvm/trunk/backends/platform/ps2/systemps2.cpp	2009-11-18 11:16:50 UTC (rev 45972)
+++ scummvm/trunk/backends/platform/ps2/systemps2.cpp	2009-11-18 13:59:36 UTC (rev 45973)
@@ -354,7 +354,7 @@
 	makeConfigPath();
 
 	_screen->wantAnim(false);
-	_screen->clearScreen();
+	fillScreen(0);
 }
 
 OSystem_PS2::~OSystem_PS2(void) {
@@ -683,10 +683,6 @@
 	_screen->unlockScreen();
 }
 
-void OSystem_PS2::fillScreen(uint32 col) {
-	_screen->fillScreen(col);
-}
-
 const OSystem::GraphicsMode OSystem_PS2::_graphicsMode = { NULL, NULL, 0 };
 
 const OSystem::GraphicsMode *OSystem_PS2::getSupportedGraphicsModes(void) const {

Modified: scummvm/trunk/backends/platform/ps2/systemps2.h
===================================================================
--- scummvm/trunk/backends/platform/ps2/systemps2.h	2009-11-18 11:16:50 UTC (rev 45972)
+++ scummvm/trunk/backends/platform/ps2/systemps2.h	2009-11-18 13:59:36 UTC (rev 45973)
@@ -72,7 +72,6 @@
 	virtual Graphics::Surface *lockScreen();
 	virtual void unlockScreen();
 	virtual void updateScreen();
-	virtual void fillScreen(uint32);
 	/* TODO : check */
 	virtual void displayMessageOnOSD(const char *msg) { printf("displayMessageOnOSD: %s\n", msg); };
 	/* */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.