summaryrefslogtreecommitdiff
path: root/src/render/graphics.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-12-15 18:57:03 +0300
committerAndrei Karas <akaras@inbox.ru>2015-12-15 18:58:08 +0300
commit1ffeeb5d960ecf45ff285b8045265bb38de86b18 (patch)
treef3e0a40a39cf0b00376d0201eee53e13e7592c5c /src/render/graphics.cpp
parent559bd8c3275b05cf061813094a880223f343cff5 (diff)
downloadmv-1ffeeb5d960ecf45ff285b8045265bb38de86b18.tar.gz
mv-1ffeeb5d960ecf45ff285b8045265bb38de86b18.tar.bz2
mv-1ffeeb5d960ecf45ff285b8045265bb38de86b18.tar.xz
mv-1ffeeb5d960ecf45ff285b8045265bb38de86b18.zip
Add safeopenglimagehelper for using in safe opengl mode only.
Diffstat (limited to 'src/render/graphics.cpp')
-rw-r--r--src/render/graphics.cpp19
1 files changed, 15 insertions, 4 deletions
diff --git a/src/render/graphics.cpp b/src/render/graphics.cpp
index a8dde9626..f038fdfff 100644
--- a/src/render/graphics.cpp
+++ b/src/render/graphics.cpp
@@ -77,11 +77,14 @@
#include "resources/imagehelper.h"
#ifdef USE_OPENGL
#include "resources/openglimagehelper.h"
-#if defined(__native_client__)
+#ifndef ANDROID
+#include "resources/safeopenglimagehelper.h"
+#endif // ANDROID
+#ifdef __native_client__
#include "render/naclfunctions.h"
#include "render/naclgles.h"
-#endif
-#endif
+#endif // __native_client__
+#endif // USE_OPENGL
#ifdef USE_OPENGL
#ifdef __APPLE__
@@ -332,12 +335,20 @@ bool Graphics::setOpenGLMode()
OpenGLImageHelper::mTextureSize = texSize;
logger->log("OpenGL texture size: %d pixels (rectangle textures)",
OpenGLImageHelper::mTextureSize);
+#ifndef ANDROID
+ SafeOpenGLImageHelper::mTextureType = GL_TEXTURE_RECTANGLE_ARB;
+ SafeOpenGLImageHelper::mTextureSize = texSize;
+#endif
}
else
{
- OpenGLImageHelper::mTextureType = GL_TEXTURE_2D;
glGetIntegerv(GL_MAX_TEXTURE_SIZE, &texSize);
+ OpenGLImageHelper::mTextureType = GL_TEXTURE_2D;
OpenGLImageHelper::mTextureSize = texSize;
+#ifndef ANDROID
+ SafeOpenGLImageHelper::mTextureType = GL_TEXTURE_2D;
+ SafeOpenGLImageHelper::mTextureSize = texSize;
+#endif
logger->log("OpenGL texture size: %d pixels",
OpenGLImageHelper::mTextureSize);
}