aboutsummaryrefslogtreecommitdiff
path: root/backends/platform/sdl/sdl.cpp
diff options
context:
space:
mode:
authorAlejandro Marzini2010-07-10 22:47:29 +0000
committerAlejandro Marzini2010-07-10 22:47:29 +0000
commit85034dc730148dab3eb85b47be3f3984337e9484 (patch)
treeb2877f92e3738fcf79956a91d17f1beabca6dcad /backends/platform/sdl/sdl.cpp
parent386785e2b85b066398122d747117f97dbbb4896a (diff)
downloadscummvm-rg350-85034dc730148dab3eb85b47be3f3984337e9484.tar.gz
scummvm-rg350-85034dc730148dab3eb85b47be3f3984337e9484.tar.bz2
scummvm-rg350-85034dc730148dab3eb85b47be3f3984337e9484.zip
Added BaseSdlGraphicsManager. Added GLTexture.
svn-id: r50795
Diffstat (limited to 'backends/platform/sdl/sdl.cpp')
-rw-r--r--backends/platform/sdl/sdl.cpp15
1 files changed, 11 insertions, 4 deletions
diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp
index 742f40511a..52a2b335aa 100644
--- a/backends/platform/sdl/sdl.cpp
+++ b/backends/platform/sdl/sdl.cpp
@@ -32,6 +32,8 @@
#include "backends/events/sdl/sdl-events.h"
#include "backends/mutex/sdl/sdl-mutex.h"
#include "backends/timer/sdl/sdl-timer.h"
+//#include "backends/graphics/sdl/sdl-graphics.h"
+#include "backends/graphics/openglsdl/openglsdl-graphics.h"
#include "icons/scummvm.xpm"
@@ -81,8 +83,13 @@ void OSystem_SDL::initBackend() {
_mixerManager->init();
}
- if (_graphicsManager == 0)
- _graphicsManager = new SdlGraphicsManager();
+ if (_graphicsManager == 0) {
+ // Changed to OpenGL for testing
+ //_graphicsManager = new SdlGraphicsManager();
+ _graphicsManager = new OpenGLSDLGraphicsManager();
+
+ ((OpenGLSDLGraphicsManager *)_graphicsManager)->init();
+ }
if (_audiocdManager == 0)
_audiocdManager = new SdlAudioCDManager();
@@ -234,9 +241,9 @@ void OSystem_SDL::setupIcon() {
free(icon);
}
-SdlGraphicsManager *OSystem_SDL::getGraphicsManager() {
+BaseSdlGraphicsManager *OSystem_SDL::getGraphicsManager() {
assert(_graphicsManager);
- return (SdlGraphicsManager *)_graphicsManager;
+ return (BaseSdlGraphicsManager *)_graphicsManager;
}
bool OSystem_SDL::pollEvent(Common::Event &event) {