summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-12-18 20:11:43 +0300
committerAndrei Karas <akaras@inbox.ru>2015-12-18 20:11:43 +0300
commitb4fcb4e1b208b6127ca28412d1a75f1ef30d1f85 (patch)
tree08a558072be002e07161927df163065a42d9c0ba
parent3fb675aa416170395d80eb51435a0d09161baf36 (diff)
downloadmv-b4fcb4e1b208b6127ca28412d1a75f1ef30d1f85.tar.gz
mv-b4fcb4e1b208b6127ca28412d1a75f1ef30d1f85.tar.bz2
mv-b4fcb4e1b208b6127ca28412d1a75f1ef30d1f85.tar.xz
mv-b4fcb4e1b208b6127ca28412d1a75f1ef30d1f85.zip
Fix compilation for android.
-rw-r--r--src/resources/safeopenglimagehelper.cpp13
-rw-r--r--src/resources/safeopenglimagehelper.h4
2 files changed, 13 insertions, 4 deletions
diff --git a/src/resources/safeopenglimagehelper.cpp b/src/resources/safeopenglimagehelper.cpp
index 1271b7e1b..44c8ca124 100644
--- a/src/resources/safeopenglimagehelper.cpp
+++ b/src/resources/safeopenglimagehelper.cpp
@@ -22,7 +22,7 @@
#include "resources/safeopenglimagehelper.h"
-#ifdef USE_OPENGL
+#if defined(USE_OPENGL) && !defined(ANDROID)
#include "graphicsmanager.h"
#include "logger.h"
@@ -265,6 +265,15 @@ void SafeOpenGLImageHelper::bindTexture(const GLuint texture)
case RENDER_GLES2_OPENGL:
MobileOpenGL2Graphics::bindTexture(mTextureType, texture);
break;
+#elif defined(ANDROID)
+ case RENDER_NORMAL_OPENGL:
+ case RENDER_MODERN_OPENGL:
+ case RENDER_SAFE_OPENGL:
+ case RENDER_GLES2_OPENGL:
+ break;
+ case RENDER_GLES_OPENGL:
+ MobileOpenGLGraphics::bindTexture(mTextureType, texture);
+ break;
#else // __native_client__
case RENDER_NORMAL_OPENGL:
NormalOpenGLGraphics::bindTexture(mTextureType, texture);
@@ -472,4 +481,4 @@ void SafeOpenGLImageHelper::copySurfaceToImage(const Image *const image,
MSDL_FreeSurface(surface);
}
-#endif
+#endif // defined(USE_OPENGL) && !defined(ANDROID)
diff --git a/src/resources/safeopenglimagehelper.h b/src/resources/safeopenglimagehelper.h
index 14de03913..74e90ad39 100644
--- a/src/resources/safeopenglimagehelper.h
+++ b/src/resources/safeopenglimagehelper.h
@@ -26,7 +26,7 @@
#include "localconsts.h"
#include "main.h"
-#ifdef USE_OPENGL
+#if defined(USE_OPENGL) && !defined(ANDROID)
#ifndef GL_TEXTURE_RECTANGLE_ARB
#define GL_TEXTURE_RECTANGLE_ARB 0x84F5
@@ -155,5 +155,5 @@ class SafeOpenGLImageHelper final : public ImageHelper
static bool mUseTextureSampler;
};
-#endif
+#endif // defined(USE_OPENGL) && !defined(ANDROID)
#endif // RESOURCES_SAFEOPENGLIMAGEHELPER_H