aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvanfanel2015-07-24 11:48:21 +0200
committervanfanel2015-07-24 11:48:21 +0200
commit8382e87baad83d0a9c4201f2fa3851f653f3bbb5 (patch)
tree07eb68ead90897d0d58f261fbc6e7f0b49b8973f
parent8cf5f96b9e497803f2fb79b771c3f1c05ee1c554 (diff)
downloadscummvm-rg350-8382e87baad83d0a9c4201f2fa3851f653f3bbb5.tar.gz
scummvm-rg350-8382e87baad83d0a9c4201f2fa3851f653f3bbb5.tar.bz2
scummvm-rg350-8382e87baad83d0a9c4201f2fa3851f653f3bbb5.zip
SDL/DISPMANX: Made minor corrections sugested by fingolfin.
-rw-r--r--backends/graphics/dispmanxsdl/dispmanxsdl-graphics.cpp13
-rwxr-xr-xconfigure4
2 files changed, 8 insertions, 9 deletions
diff --git a/backends/graphics/dispmanxsdl/dispmanxsdl-graphics.cpp b/backends/graphics/dispmanxsdl/dispmanxsdl-graphics.cpp
index e3336844ee..7760005d1f 100644
--- a/backends/graphics/dispmanxsdl/dispmanxsdl-graphics.cpp
+++ b/backends/graphics/dispmanxsdl/dispmanxsdl-graphics.cpp
@@ -175,7 +175,7 @@ void DispmanXSdlGraphicsManager::dispmanXSetup(int srcWidth, int srcHeight) {
vc_dispmanx_update_submit_sync(_dispvars->update);
}
-void dispmanXVSyncCallback (DISPMANX_UPDATE_HANDLE_T u, void *arg) {
+void dispmanXVSyncCallback(DISPMANX_UPDATE_HANDLE_T u, void *arg) {
struct dispmanxPage *page = (struct dispmanxPage*)arg;
struct dispvarsStruct *dispvars = page->dispvars;
@@ -237,12 +237,10 @@ void DispmanXSdlGraphicsManager::dispmanXUpdate() {
struct dispmanxPage *DispmanXSdlGraphicsManager::dispmanXGetFreePage(void) {
struct dispmanxPage *page = NULL;
- while (!page)
- {
+ while (!page) {
// Try to find a free page
for (int i = 0; i < _dispvars->numpages; ++i) {
- if (!_dispvars->pages[i].used)
- {
+ if (!_dispvars->pages[i].used) {
page = (_dispvars->pages) + i;
break;
}
@@ -328,8 +326,9 @@ bool DispmanXSdlGraphicsManager::loadGFXMode() {
((1 << _screenFormat.gBits()) - 1) << _screenFormat.gShift ,
((1 << _screenFormat.bBits()) - 1) << _screenFormat.bShift ,
((1 << _screenFormat.aBits()) - 1) << _screenFormat.aShift );
- if (_screen == NULL)
- error("allocating _screen failed");
+ if (_screen == NULL)
+ error("allocating _screen failed");
+
// Avoid having SDL_SRCALPHA set even if we supplied an alpha-channel in the format.
SDL_SetAlpha(_screen, 0, 255);
diff --git a/configure b/configure
index 85f59f0ccc..2631a29b62 100755
--- a/configure
+++ b/configure
@@ -2549,8 +2549,8 @@ if test -n "$_host"; then
_port_mk="backends/platform/dingux/dingux.mk"
;;
raspberrypi)
- # We should have setup raspberrypi-sdl-config with modified prefix as part of
- # the cross-building enviroment.
+ # For proper cross-compilation, we assume that the cross-building environment provides
+ # an sdl-config executable with modified prefix pointing to $RPI_ROOT/usr.
_savegame_timestamp=no
_eventrec=no
_build_scalers=no