diff options
author | hurikhan <m4r10.5ch14ck@gmail.com> | 2015-01-11 08:06:31 +0800 |
---|---|---|
committer | hurikhan <m4r10.5ch14ck@gmail.com> | 2015-01-11 08:06:31 +0800 |
commit | 291d7992ceae487a63dc2d6eb1ee2da7312017c5 (patch) | |
tree | 6bd0489107fa33477ccc7e7553c79d3001fe433a /platform/iphone/gl_view.mm | |
parent | a8e3c5c0b7fb202bcceb06b9373b5b6a4ff8f9b8 (diff) | |
parent | d30f4e52f654a26e14223a6ef9a946cc6282c0db (diff) |
Merge branch 'master' into x11-fullscreen
Diffstat (limited to 'platform/iphone/gl_view.mm')
-rwxr-xr-x | platform/iphone/gl_view.mm | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/platform/iphone/gl_view.mm b/platform/iphone/gl_view.mm index 4dd2084c20..bee01d3c72 100755 --- a/platform/iphone/gl_view.mm +++ b/platform/iphone/gl_view.mm @@ -307,11 +307,7 @@ static void clear_touches() { nil]; // Create our EAGLContext, and if successful make it current and create our framebuffer. -#ifdef GLES1_OVERRIDE - context = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES1]; -#else context = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES2]; -#endif if(!context || ![EAGLContext setCurrentContext:context] || ![self createFramebuffer]) { |