From 3baddc752eee457b1e8541accbacb4bfeb8127a2 Mon Sep 17 00:00:00 2001 From: Kostas Nakos Date: Sun, 4 Jan 2009 16:07:19 +0000 Subject: Virtualize sdl backend's setGraphicsModeIntern() so it can be overloaded by CE. Scalers are pre-selected by magic on CE. Overriding these selections leads to crashes svn-id: r35728 --- backends/platform/sdl/sdl.h | 2 +- backends/platform/wince/wince-sdl.cpp | 5 +++++ backends/platform/wince/wince-sdl.h | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) (limited to 'backends/platform') diff --git a/backends/platform/sdl/sdl.h b/backends/platform/sdl/sdl.h index 09c45d8408..1bfdca6b69 100644 --- a/backends/platform/sdl/sdl.h +++ b/backends/platform/sdl/sdl.h @@ -275,7 +275,7 @@ protected: }; VideoState _videoMode, _oldVideoMode; - void setGraphicsModeIntern(); + virtual void setGraphicsModeIntern(); // overloaded by CE backend /** Force full redraw on next updateScreen */ bool _forceFull; diff --git a/backends/platform/wince/wince-sdl.cpp b/backends/platform/wince/wince-sdl.cpp index 3e034baef4..78dc552dce 100644 --- a/backends/platform/wince/wince-sdl.cpp +++ b/backends/platform/wince/wince-sdl.cpp @@ -1135,6 +1135,11 @@ int OSystem_WINCE3::getDefaultGraphicsMode() const { return GFX_NORMAL; } +void OSystem_WINCE3::setGraphicsModeIntern() { + // Scalers have been pre-selected for the desired mode. + // No further tuning required. +} + bool OSystem_WINCE3::update_scalers() { if (_videoMode.mode != GFX_NORMAL) return false; diff --git a/backends/platform/wince/wince-sdl.h b/backends/platform/wince/wince-sdl.h index e4dfddfecd..46070e1180 100644 --- a/backends/platform/wince/wince-sdl.h +++ b/backends/platform/wince/wince-sdl.h @@ -65,8 +65,8 @@ public: // Update the dirty areas of the screen void internUpdateScreen(); + void setGraphicsModeIntern(); void initSize(uint w, uint h); - void initBackend(); // Overloaded from SDL backend (toolbar handling) -- cgit v1.2.3