aboutsummaryrefslogtreecommitdiff
path: root/backends/graphics/openglsdl
diff options
context:
space:
mode:
authorAlejandro Marzini2010-07-15 04:01:41 +0000
committerAlejandro Marzini2010-07-15 04:01:41 +0000
commit9ef2fc4744f88837c63150b09655ae3e51023b7e (patch)
tree0da80d52789b9cc4251c5df3e8bbb5b0707d44f5 /backends/graphics/openglsdl
parentd677ba5a1146ae48c0831e1056350d3efa2e43fd (diff)
downloadscummvm-rg350-9ef2fc4744f88837c63150b09655ae3e51023b7e.tar.gz
scummvm-rg350-9ef2fc4744f88837c63150b09655ae3e51023b7e.tar.bz2
scummvm-rg350-9ef2fc4744f88837c63150b09655ae3e51023b7e.zip
Fixed doing OpenGL calls before a graphical context was created.
svn-id: r50905
Diffstat (limited to 'backends/graphics/openglsdl')
-rw-r--r--backends/graphics/openglsdl/openglsdl-graphics.cpp11
-rw-r--r--backends/graphics/openglsdl/openglsdl-graphics.h2
2 files changed, 3 insertions, 10 deletions
diff --git a/backends/graphics/openglsdl/openglsdl-graphics.cpp b/backends/graphics/openglsdl/openglsdl-graphics.cpp
index ceaa20c425..aaa7ac7dd0 100644
--- a/backends/graphics/openglsdl/openglsdl-graphics.cpp
+++ b/backends/graphics/openglsdl/openglsdl-graphics.cpp
@@ -31,20 +31,15 @@ OpenGLSdlGraphicsManager::OpenGLSdlGraphicsManager()
:
_hwscreen(0) {
-}
-
-OpenGLSdlGraphicsManager::~OpenGLSdlGraphicsManager() {
-
-}
-
-void OpenGLSdlGraphicsManager::init() {
if (SDL_InitSubSystem(SDL_INIT_VIDEO) == -1) {
error("Could not initialize SDL: %s", SDL_GetError());
}
SDL_ShowCursor(SDL_DISABLE);
+}
+
+OpenGLSdlGraphicsManager::~OpenGLSdlGraphicsManager() {
- OpenGLGraphicsManager::init();
}
#ifdef USE_RGB_COLOR
diff --git a/backends/graphics/openglsdl/openglsdl-graphics.h b/backends/graphics/openglsdl/openglsdl-graphics.h
index c678f3f0ca..f1f0d5ff37 100644
--- a/backends/graphics/openglsdl/openglsdl-graphics.h
+++ b/backends/graphics/openglsdl/openglsdl-graphics.h
@@ -42,8 +42,6 @@ public:
OpenGLSdlGraphicsManager();
virtual ~OpenGLSdlGraphicsManager();
- virtual void init();
-
#ifdef USE_RGB_COLOR
virtual Common::List<Graphics::PixelFormat> getSupportedFormats() const;
#endif