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

[lordhoto]

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:
dbbc458671 OPENGLSDL: Move time stamp for last video mode set after fallback mode setup.
fa00a79b49 NEWS: Mention OpenGL output.


Commit: dbbc45867147ea1410e1403875325ad4c35b5a0b
    https://github.com/scummvm/scummvm/commit/dbbc45867147ea1410e1403875325ad4c35b5a0b
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2014-06-17T23:31:16+02:00

Commit Message:
OPENGLSDL: Move time stamp for last video mode set after fallback mode setup.

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



diff --git a/backends/graphics/openglsdl/openglsdl-graphics.cpp b/backends/graphics/openglsdl/openglsdl-graphics.cpp
index bca0750..c3584da 100644
--- a/backends/graphics/openglsdl/openglsdl-graphics.cpp
+++ b/backends/graphics/openglsdl/openglsdl-graphics.cpp
@@ -328,8 +328,6 @@ bool OpenGLSdlGraphicsManager::setupMode(uint width, uint height) {
 	}
 
 	_hwScreen = SDL_SetVideoMode(width, height, 32, flags);
-	// Part of the WORKAROUND mentioned above.
-	_lastVideoModeLoad = SDL_GetTicks();
 
 	if (!_hwScreen) {
 		// We treat fullscreen requests as a "hint" for now. This means in
@@ -339,6 +337,9 @@ bool OpenGLSdlGraphicsManager::setupMode(uint width, uint height) {
 		}
 	}
 
+	// Part of the WORKAROUND mentioned above.
+	_lastVideoModeLoad = SDL_GetTicks();
+
 	if (_hwScreen) {
 		// This is pretty confusing since RGBA8888 talks about the memory
 		// layout here. This is a different logical layout depending on


Commit: fa00a79b497c9323ddc102bfeed7cd2e47444c46
    https://github.com/scummvm/scummvm/commit/fa00a79b497c9323ddc102bfeed7cd2e47444c46
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2014-06-17T23:31:16+02:00

Commit Message:
NEWS: Mention OpenGL output.

Changed paths:
    NEWS



diff --git a/NEWS b/NEWS
index 3db2bd2..5fbbaf2 100644
--- a/NEWS
+++ b/NEWS
@@ -15,6 +15,12 @@ For a more comprehensive changelog of the latest experimental code, see:
      libpng, which are faster and can handle more images.
      (NOTE: The change to libpng was done in version 1.6.0, but it was not
      added to the NEWS file).
+   - Added generic OpenGL (ES) output (based on GSoC Task).
+
+ SDL:
+   - Added OpenGL graphics mode based on our generic OpenGL output. This
+     allows for arbitrary output sizes. However, it does not support special
+     filters like AdvMAME, HQ, etc.
 
  AGOS:
    - Added mouse wheel support for inventory and save game lists.