diff options
author | Daria Volvenkova <d.volvenkova@corp.mail.ru> | 2017-05-16 14:42:32 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-16 14:42:32 +0300 |
commit | d2f79bd2c7004af2d1459e8d5b7748763f241a54 (patch) | |
tree | 64300bccb750e59f7c3a05800eafcd5c3b3f89cb /android/jni/com/mapswithme/opengl/androidoglcontext.hpp | |
parent | aa6703383e8d4c2ff8445e8b3c27728846cdab4b (diff) | |
parent | 086d6f9cf247cea07cff6bc33d5567dc7c64806b (diff) |
Merge pull request #6040 from rokuz/es3-supportbeta-810
Added OpenGL ES3 support
Diffstat (limited to 'android/jni/com/mapswithme/opengl/androidoglcontext.hpp')
-rw-r--r-- | android/jni/com/mapswithme/opengl/androidoglcontext.hpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/android/jni/com/mapswithme/opengl/androidoglcontext.hpp b/android/jni/com/mapswithme/opengl/androidoglcontext.hpp index 424aac5ff3..5c0bed7765 100644 --- a/android/jni/com/mapswithme/opengl/androidoglcontext.hpp +++ b/android/jni/com/mapswithme/opengl/androidoglcontext.hpp @@ -1,17 +1,16 @@ #pragma once +#include "drape/glIncludes.hpp" #include "drape/oglcontext.hpp" -#include <EGL/egl.h> -#include <GLES2/gl2.h> - namespace android { class AndroidOGLContext : public dp::OGLContext { public: - AndroidOGLContext(EGLDisplay display, EGLSurface surface, EGLConfig config, AndroidOGLContext * contextToShareWith); + AndroidOGLContext(bool supportedES3, EGLDisplay display, EGLSurface surface, + EGLConfig config, AndroidOGLContext * contextToShareWith); ~AndroidOGLContext(); void makeCurrent() override; |