[Scummvm-cvs-logs] scummvm master -> e06b7431e8e199c169dd55b675bf7b8e70251e61

dhewg dhewg at wiibrew.org
Fri Feb 25 00:11:59 CET 2011


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:
ff11ab284a Revert "GUI: Properly clear the screen buffer"
e06b7431e8 ANDROID: Remove weird workaround in clearScreen()


Commit: ff11ab284adb30b0de9b80b7a8a9a19b3861e977
    https://github.com/scummvm/scummvm/commit/ff11ab284adb30b0de9b80b7a8a9a19b3861e977
Author: dhewg (dhewg at wiibrew.org)
Date: 2011-02-24T15:08:46-08:00

Commit Message:
Revert "GUI: Properly clear the screen buffer"

This reverts commit c8551b80dd917c35d367c1f15f4b9c2618da3684.

Turns out the flicking comes from an updateScreen() call in
android's clearScreen(). Besides, this broke GMM... a little

Changed paths:
    gui/ThemeEngine.cpp



diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp
index 235ea24..026370a 100644
--- a/gui/ThemeEngine.cpp
+++ b/gui/ThemeEngine.cpp
@@ -421,9 +421,10 @@ bool ThemeEngine::init() {
 }
 
 void ThemeEngine::clearAll() {
-	if (_initOk)
-		memset(_screen.pixels, _overlayFormat.RGBToColor(0, 0, 0),
-				_screen.w * _screen.h * sizeof(uint16));
+	if (_initOk) {
+		_system->clearOverlay();
+		_system->grabOverlay((OverlayColor *)_screen.pixels, _screen.w);
+	}
 }
 
 void ThemeEngine::refresh() {


Commit: e06b7431e8e199c169dd55b675bf7b8e70251e61
    https://github.com/scummvm/scummvm/commit/e06b7431e8e199c169dd55b675bf7b8e70251e61
Author: dhewg (dhewg at wiibrew.org)
Date: 2011-02-24T15:10:42-08:00

Commit Message:
ANDROID: Remove weird workaround in clearScreen()

This resulted in flickering all over the GUI

Changed paths:
    backends/platform/android/gfx.cpp



diff --git a/backends/platform/android/gfx.cpp b/backends/platform/android/gfx.cpp
index a84e5ce..35c91d7 100644
--- a/backends/platform/android/gfx.cpp
+++ b/backends/platform/android/gfx.cpp
@@ -362,8 +362,9 @@ void OSystem_Android::clearOverlay() {
 
 	_overlay_texture->fillBuffer(0);
 
+	// breaks more than it fixes, disabled for now
 	// Shouldn't need this, but works around a 'blank screen' bug on Nexus1
-	updateScreen();
+	//updateScreen();
 }
 
 void OSystem_Android::grabOverlay(OverlayColor *buf, int pitch) {






More information about the Scummvm-git-logs mailing list