aboutsummaryrefslogtreecommitdiff
path: root/sdl.cpp
diff options
context:
space:
mode:
authorMax Horn2002-04-27 11:56:47 +0000
committerMax Horn2002-04-27 11:56:47 +0000
commit7e47e03cd17d22f9ccfd7376511350b622ea9c38 (patch)
tree299391f9c6b9e0bcb74e1da80e23bc8b80991c99 /sdl.cpp
parent698e28eb6be8c40fb05981c1a00fe89bc6da7e3b (diff)
downloadscummvm-rg350-7e47e03cd17d22f9ccfd7376511350b622ea9c38.tar.gz
scummvm-rg350-7e47e03cd17d22f9ccfd7376511350b622ea9c38.tar.bz2
scummvm-rg350-7e47e03cd17d22f9ccfd7376511350b622ea9c38.zip
hopefully this fixes the scalers on non-MacOSX systems again...
svn-id: r4107
Diffstat (limited to 'sdl.cpp')
-rw-r--r--sdl.cpp13
1 files changed, 9 insertions, 4 deletions
diff --git a/sdl.cpp b/sdl.cpp
index f7435e4738..51dcdf6afc 100644
--- a/sdl.cpp
+++ b/sdl.cpp
@@ -311,7 +311,6 @@ normal_mode:;
uint16 *tmp_screen = (uint16*)calloc(320*204 + 16,sizeof(uint16));
_mode_flags = DF_FORCE_FULL_ON_PALETTE | DF_WANT_RECT_OPTIM | DF_2xSAI | DF_SEPARATE_HWSCREEN | DF_UPDATE_EXPAND_1_PIXEL;
- Init_2xSaI(555);
sdl_screen = SDL_CreateRGBSurface(SDL_SWSURFACE, 320, 200, 8, 0, 0, 0, 0);
if (sdl_screen == NULL)
error("SDL_CreateRGBSurface(SDL_SWSURFACE, 320, 200, 8, 0, 0, 0, 0) failed");
@@ -321,10 +320,16 @@ normal_mode:;
);
if (sdl_hwscreen == NULL)
error("sdl_hwscreen failed");
-
+
/* Need some extra bytes around when using 2XSAI */
- sdl_tmpscreen = SDL_CreateRGBSurfaceFrom(tmp_screen + TMP_SCREEN_OFFS, 320, 200, 16,
- 320*2, 0x7C00,0x3E0,0x001F,0);
+ Init_2xSaI(555);
+ sdl_tmpscreen = SDL_CreateRGBSurfaceFrom(tmp_screen + TMP_SCREEN_OFFS,
+ 320, 200, 16, 320*2,
+ sdl_hwscreen->format->Rmask,
+ sdl_hwscreen->format->Gmask,
+ sdl_hwscreen->format->Bmask,
+ sdl_hwscreen->format->Amask);
+
if (sdl_tmpscreen == NULL)
error("sdl_tmpscreen failed");