diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-12-15 18:57:03 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-12-15 18:58:08 +0300 |
| commit | 1ffeeb5d960ecf45ff285b8045265bb38de86b18 (patch) | |
| tree | f3e0a40a39cf0b00376d0201eee53e13e7592c5c /src/graphicsmanager.cpp | |
| parent | 559bd8c3275b05cf061813094a880223f343cff5 (diff) | |
| download | manaplus-1ffeeb5d960ecf45ff285b8045265bb38de86b18.tar.gz manaplus-1ffeeb5d960ecf45ff285b8045265bb38de86b18.tar.bz2 manaplus-1ffeeb5d960ecf45ff285b8045265bb38de86b18.tar.xz manaplus-1ffeeb5d960ecf45ff285b8045265bb38de86b18.zip | |
Add safeopenglimagehelper for using in safe opengl mode only.
Diffstat (limited to 'src/graphicsmanager.cpp')
| -rw-r--r-- | src/graphicsmanager.cpp | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/src/graphicsmanager.cpp b/src/graphicsmanager.cpp index 90b1c5a69..129ad966d 100644 --- a/src/graphicsmanager.cpp +++ b/src/graphicsmanager.cpp @@ -61,9 +61,11 @@ #ifdef USE_OPENGL #include "resources/fboinfo.h" #include "resources/openglimagehelper.h" - +#ifndef ANDROID +#include "resources/safeopenglimagehelper.h" +#endif // ANDROID #include "render/mglfunctions.h" -#endif +#endif // USE_OPENGL #include "resources/sdlimagehelper.h" @@ -289,7 +291,7 @@ int GraphicsManager::detectGraphics() #define RENDER_GLES2_OPENGL_INIT #else // defined(ANDROID) #define RENDER_SAFE_OPENGL_INIT \ - imageHelper = new OpenGLImageHelper; \ + imageHelper = new SafeOpenGLImageHelper; \ surfaceImageHelper = new SurfaceImageHelper; \ mainGraphics = new SafeOpenGLGraphics; \ mUseTextureSampler = false; @@ -494,6 +496,9 @@ void GraphicsManager::initGraphics() openGLMode = intToRenderType(config.getIntValue("opengl")); #ifdef USE_OPENGL OpenGLImageHelper::setBlur(config.getBoolValue("blur")); +#ifndef ANDROID + SafeOpenGLImageHelper::setBlur(config.getBoolValue("blur")); +#endif // ANDROID SurfaceImageHelper::SDLSetEnableAlphaCache( config.getBoolValue("alphaCache") && !openGLMode); ImageHelper::setEnableAlpha((config.getFloatValue("guialpha") != 1.0F || @@ -786,11 +791,17 @@ void GraphicsManager::updateTextureFormat() const config.getBoolValue("newtextures")) { OpenGLImageHelper::setInternalTextureType(GL_RGBA); +#ifndef ANDROID + SafeOpenGLImageHelper::setInternalTextureType(GL_RGBA); +#endif logger->log1("using RGBA texture format"); } else { OpenGLImageHelper::setInternalTextureType(4); +#ifndef ANDROID + SafeOpenGLImageHelper::setInternalTextureType(4); +#endif logger->log1("using 4 texture format"); } } @@ -1365,6 +1376,9 @@ void GraphicsManager::createTextureSampler() } } OpenGLImageHelper::setUseTextureSampler(mUseTextureSampler); +#ifndef ANDROID + SafeOpenGLImageHelper::setUseTextureSampler(false); +#endif } GLenum GraphicsManager::getLastError() |