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

[sev-]

This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
825679ff64 GCW0: Disable Timidity by default
849ab0d9d3 GCW0: Clean up build script
39dc1dd2e1 GCW0: Enable building with all scalers disabled
a7930f2af7 GCW0: Enable triple buffering


Commit: 825679ff64b5c2b76e18d752fbb4a00a53c8de51
    https://github.com/scummvm/scummvm/commit/825679ff64b5c2b76e18d752fbb4a00a53c8de51
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-04-10T13:56:44+02:00

Commit Message:
GCW0: Disable Timidity by default

Changed paths:
    configure



diff --git a/configure b/configure
index dbff409..d2ffa9b 100755
--- a/configure
+++ b/configure
@@ -2734,17 +2734,15 @@ if test -n "$_host"; then
 			append_var DEFINES "-DREDUCE_MEMORY_USAGE"
 			append_var CXXFLAGS "-mips32"
 			_backend="dingux"
+			_alsa=no
 			_mt32emu=no
+			_seq_midi=no
+			_timidity=no
+			_build_hq_scalers=no
 			_optimization_level=-O3
-			# Disable alsa midi to get the port build on OpenDingux toolchain
-			_alsa=no
 			_vkeybd=yes
-			_build_hq_scalers=no
 			_keymapper=yes
-			# Force disable vorbis on dingux, it has terrible performance compared to tremor
 			_vorbis=no
-			# Force disable seq on dingux, no way to use it and it would get enabled by default with configure
-			_seq_midi=no
 			_port_mk="backends/platform/dingux/dingux.mk"
 			;;
 		gp2x)


Commit: 849ab0d9d30044e522d314bd625b62f0cbb92fa2
    https://github.com/scummvm/scummvm/commit/849ab0d9d30044e522d314bd625b62f0cbb92fa2
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-04-10T13:57:02+02:00

Commit Message:
GCW0: Clean up build script

Changed paths:
    backends/platform/dingux/build.gcw0.sh



diff --git a/backends/platform/dingux/build.gcw0.sh b/backends/platform/dingux/build.gcw0.sh
index c1a4fa2..7a31d4f 100755
--- a/backends/platform/dingux/build.gcw0.sh
+++ b/backends/platform/dingux/build.gcw0.sh
@@ -3,4 +3,4 @@
 export PATH=/opt/gcw0-toolchain/usr/bin:$PATH
 
 # Disable high resolution engines since we have 320x240 hardware
-./configure --host=gcw0 --enable-plugins --default-dynamic --enable-release  --disable-mt32emu --disable-hq-scalers && make -j6 gcw-opk && ls -l scummvm.opk
+./configure --host=gcw0 --enable-plugins --default-dynamic --enable-release && make -j6 gcw-opk && ls -l scummvm.opk


Commit: 39dc1dd2e1c436b4cc75367c0f6a31452334930e
    https://github.com/scummvm/scummvm/commit/39dc1dd2e1c436b4cc75367c0f6a31452334930e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-04-10T14:06:34+02:00

Commit Message:
GCW0: Enable building with all scalers disabled

Changed paths:
    backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp
    configure



diff --git a/backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp b/backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp
index 0b9cc0c..7a248f1 100644
--- a/backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp
+++ b/backends/graphics/dinguxsdl/dinguxsdl-graphics.cpp
@@ -35,6 +35,10 @@ static const OSystem::GraphicsMode s_supportedGraphicsModes[] = {
 	{0, 0, 0}
 };
 
+#ifndef USE_SCALERS
+#define DownscaleAllByHalf 0
+#endif
+
 DINGUXSdlGraphicsManager::DINGUXSdlGraphicsManager(SdlEventSource *boss, SdlWindow *window)
 	: SurfaceSdlGraphicsManager(boss, window) {
 }
@@ -61,9 +65,11 @@ bool DINGUXSdlGraphicsManager::setGraphicsMode(int mode) {
 	case GFX_NORMAL:
 		newScaleFactor = 1;
 		break;
+#ifdef USE_SCALERS
 	case GFX_HALF:
 		newScaleFactor = 1;
 		break;
+#endif
 	default:
 		warning("unknown gfx mode %d", mode);
 		return false;
@@ -89,9 +95,11 @@ void DINGUXSdlGraphicsManager::setGraphicsModeIntern() {
 	case GFX_NORMAL:
 		newScalerProc = Normal1x;
 		break;
+#ifdef USE_SCALERS
 	case GFX_HALF:
 		newScalerProc = DownscaleAllByHalf;
 		break;
+#endif
 
 	default:
 		error("Unknown gfx mode %d", _videoMode.mode);
diff --git a/configure b/configure
index d2ffa9b..03f9cf2 100755
--- a/configure
+++ b/configure
@@ -2738,7 +2738,7 @@ if test -n "$_host"; then
 			_mt32emu=no
 			_seq_midi=no
 			_timidity=no
-			_build_hq_scalers=no
+			_build_scalers=no
 			_optimization_level=-O3
 			_vkeybd=yes
 			_keymapper=yes


Commit: a7930f2af7b8bd525d3a01971fdcf3aea646fc96
    https://github.com/scummvm/scummvm/commit/a7930f2af7b8bd525d3a01971fdcf3aea646fc96
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-04-10T15:09:14+02:00

Commit Message:
GCW0: Enable triple buffering

Changed paths:
    backends/graphics/surfacesdl/surfacesdl-graphics.cpp



diff --git a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
index 2134551..f00e6e7 100644
--- a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
+++ b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
@@ -812,7 +812,11 @@ bool SurfaceSdlGraphicsManager::loadGFXMode() {
 #endif
 
 		_hwscreen = SDL_SetVideoMode(_videoMode.hardwareWidth, _videoMode.hardwareHeight, 16,
+#ifndef GCW0
 			_videoMode.fullscreen ? (SDL_FULLSCREEN|SDL_SWSURFACE) : SDL_SWSURFACE
+#else
+			SDL_HWSURFACE | SDL_TRIPLEBUF
+#endif
 			);
 	}
 
@@ -1258,7 +1262,11 @@ void SurfaceSdlGraphicsManager::internUpdateScreen() {
 
 		// Finally, blit all our changes to the screen
 		if (!_displayDisabled) {
+#ifndef GCW0
 			SDL_UpdateRects(_hwscreen, _numDirtyRects, _dirtyRectList);
+#else
+			SDL_Flip(_hwscreen);
+#endif
 		}
 	}