[Scummvm-cvs-logs] scummvm master -> 063d008e7296e16ddf85628da62265875bac0120

Strangerke Strangerke at scummvm.org
Mon Jan 13 10:23:06 CET 2014


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:
6677a973c2 SDL: Avoid having SDL_SRCALPHA set even if we have alpha in the pixelformat.
063d008e72 Merge pull request #420 from somaen/disableSDLAlpha


Commit: 6677a973c2b9b742897441d3b8571b81b41fd297
    https://github.com/scummvm/scummvm/commit/6677a973c2b9b742897441d3b8571b81b41fd297
Author: Einar Johan Trøan Sømåen (einarjohants at gmail.com)
Date: 2014-01-11T07:36:04-08:00

Commit Message:
SDL: Avoid having SDL_SRCALPHA set even if we have alpha in the pixelformat.

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 0a4dcf3..89802ac 100644
--- a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
+++ b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
@@ -746,6 +746,8 @@ bool SurfaceSdlGraphicsManager::loadGFXMode() {
 	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);
 #else
 	_screen = SDL_CreateRGBSurface(SDL_SWSURFACE, _videoMode.screenWidth, _videoMode.screenHeight, 8, 0, 0, 0, 0);
 	if (_screen == NULL)


Commit: 063d008e7296e16ddf85628da62265875bac0120
    https://github.com/scummvm/scummvm/commit/063d008e7296e16ddf85628da62265875bac0120
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-01-13T01:22:39-08:00

Commit Message:
Merge pull request #420 from somaen/disableSDLAlpha

SDL: Avoid having SDL_SRCALPHA set even if we have alpha in the pixelformat.

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









More information about the Scummvm-git-logs mailing list