diff options
| author | Alejandro Marzini | 2010-07-13 05:38:10 +0000 |
|---|---|---|
| committer | Alejandro Marzini | 2010-07-13 05:38:10 +0000 |
| commit | 84ceae932852fe684ea553daee712b52da83add6 (patch) | |
| tree | 13bc020842cff6ebc0d12685551c122ec3df4f12 /backends/graphics/opengl/opengl-graphics.cpp | |
| parent | 5f86d1127528244f20296833889881e185f16795 (diff) | |
| download | scummvm-rg350-84ceae932852fe684ea553daee712b52da83add6.tar.gz scummvm-rg350-84ceae932852fe684ea553daee712b52da83add6.tar.bz2 scummvm-rg350-84ceae932852fe684ea553daee712b52da83add6.zip | |
Check if USE_OPENGL is defined for compiling OpenGL code.
svn-id: r50842
Diffstat (limited to 'backends/graphics/opengl/opengl-graphics.cpp')
| -rw-r--r-- | backends/graphics/opengl/opengl-graphics.cpp | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/backends/graphics/opengl/opengl-graphics.cpp b/backends/graphics/opengl/opengl-graphics.cpp index fc864957d8..f5f0cdeb57 100644 --- a/backends/graphics/opengl/opengl-graphics.cpp +++ b/backends/graphics/opengl/opengl-graphics.cpp @@ -23,8 +23,11 @@ * */ +#ifdef USE_OPENGL + #include "backends/graphics/opengl/opengl-graphics.h" #include "common/mutex.h" +#include "common/translation.h" OpenGLGraphicsManager::OpenGLGraphicsManager() : @@ -41,7 +44,7 @@ OpenGLGraphicsManager::OpenGLGraphicsManager() memset(&_videoMode, 0, sizeof(_videoMode)); memset(&_transactionDetails, 0, sizeof(_transactionDetails)); - _videoMode.mode = GFX_NORMAL; + _videoMode.mode = OpenGL::GFX_NORMAL; _videoMode.scaleFactor = 1; _videoMode.fullscreen = false; } @@ -91,7 +94,11 @@ bool OpenGLGraphicsManager::getFeatureState(OSystem::Feature f) { // static const OSystem::GraphicsMode s_supportedGraphicsModes[] = { - {"1x", "Normal", GFX_NORMAL}, + {"gl1x", _s("OpenGL Normal (no scaling)"), OpenGL::GFX_NORMAL}, +#ifdef USE_SCALERS + {"gl2x", "OpenGL 2x", OpenGL::GFX_DOUBLESIZE}, + {"gl3x", "OpenGL 3x", OpenGL::GFX_TRIPLESIZE}, +#endif {0, 0, 0} }; @@ -100,7 +107,7 @@ const OSystem::GraphicsMode *OpenGLGraphicsManager::getSupportedGraphicsModes() } int OpenGLGraphicsManager::getDefaultGraphicsMode() const { - return GFX_NORMAL; + return OpenGL::GFX_NORMAL; } bool OpenGLGraphicsManager::setGraphicsMode(int mode) { @@ -108,7 +115,7 @@ bool OpenGLGraphicsManager::setGraphicsMode(int mode) { } int OpenGLGraphicsManager::getGraphicsMode() const { - return GFX_NORMAL; + return OpenGL::GFX_NORMAL; } #ifdef USE_RGB_COLOR @@ -496,3 +503,5 @@ void OpenGLGraphicsManager::unloadGFXMode() { bool OpenGLGraphicsManager::hotswapGFXMode() { return false; } + +#endif |