summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-06-24 12:40:55 +0300
committerAndrei Karas <akaras@inbox.ru>2014-06-24 12:40:55 +0300
commita199ee013ee9f0182e5e66d3a1477cb9483b994b (patch)
tree3e25d6e6e67c7bfafbf952cd5fab5b120b109f25
parentc8197ed59f213e9831b8170e3fa521041e03cb9a (diff)
downloadmanaplus-a199ee013ee9f0182e5e66d3a1477cb9483b994b.tar.gz
manaplus-a199ee013ee9f0182e5e66d3a1477cb9483b994b.tar.bz2
manaplus-a199ee013ee9f0182e5e66d3a1477cb9483b994b.tar.xz
manaplus-a199ee013ee9f0182e5e66d3a1477cb9483b994b.zip
Dont use legacy texture format in mobileopengl and modernopengl.
-rw-r--r--src/graphicsmanager.cpp11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/graphicsmanager.cpp b/src/graphicsmanager.cpp
index 696c0fb77..a86877e17 100644
--- a/src/graphicsmanager.cpp
+++ b/src/graphicsmanager.cpp
@@ -238,9 +238,14 @@ void GraphicsManager::createRenderers()
if (!settings.options.noOpenGL)
{
if (settings.options.renderer < 0)
+ {
useOpenGL = intToRenderType(config.getIntValue("opengl"));
+ settings.options.renderer = useOpenGL;
+ }
else
+ {
useOpenGL = intToRenderType(settings.options.renderer);
+ }
}
// Setup image loading for the right image format
@@ -686,8 +691,12 @@ void GraphicsManager::updateTextureFormat() const
}
}
+ const int renderer = settings.options.renderer;
+
// using default formats
- if (config.getBoolValue("newtextures"))
+ if (renderer == RENDER_MODERN_OPENGL
+ || renderer == RENDER_GLES_OPENGL
+ || config.getBoolValue("newtextures"))
{
OpenGLImageHelper::setInternalTextureType(GL_RGBA);
logger->log1("using RGBA texture format");