Added BaseSdlGraphicsManager. Added GLTexture.

svn-id: r50795

2 files changed, 13 insertions, 6 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) {
diff --git a/backends/platform/sdl/sdl.h b/backends/platform/sdl/sdl.h
index eb3d22d524..97c91966c1 100644
--- a/backends/platform/sdl/sdl.h
+++ b/backends/platform/sdl/sdl.h
@@ -33,7 +33,7 @@
 #endif
 
 #include "backends/modular-backend.h"
-#include "backends/graphics/sdl/sdl-graphics.h"
+#include "backends/graphics/sdl/basesdl-graphics.h"
 #include "backends/mixer/sdl/sdl-mixer.h"
 
 /** 
@@ -54,7 +54,7 @@ public:
 	/**
 	 * Get the Graphics Manager instance. Used by other managers.
 	 */
-	virtual SdlGraphicsManager *getGraphicsManager();
+	virtual BaseSdlGraphicsManager *getGraphicsManager();
 
 	/**
 	 * Get the Mixer Manager instance. Not to confuse with getMixer(),