diff options
| author | Anton Yabchinskiy | 2015-01-14 23:17:15 +0300 |
|---|---|---|
| committer | Anton Yabchinskiy | 2015-01-14 23:17:15 +0300 |
| commit | d6998995b54fd4fed83eef9db3bbb45fa60565db (patch) | |
| tree | 927e4e2441db1c62b3853d03f3ed4bb996881045 /platform/iphone/os_iphone.cpp | |
| parent | b6c5cb1064eab63788060dc918d7fec53e57a532 (diff) | |
| parent | 04af74596d070f062bd917b0364d87c57544f8d5 (diff) | |
| download | godot-d6998995b54fd4fed83eef9db3bbb45fa60565db.tar.gz godot-d6998995b54fd4fed83eef9db3bbb45fa60565db.tar.zst godot-d6998995b54fd4fed83eef9db3bbb45fa60565db.zip | |
Merge branch 'master' of github.com:okamstudio/godot
Conflicts:
platform/x11/detect.py
Diffstat (limited to 'platform/iphone/os_iphone.cpp')
| -rw-r--r-- | platform/iphone/os_iphone.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/platform/iphone/os_iphone.cpp b/platform/iphone/os_iphone.cpp index 812879d42..aee5f7668 100644 --- a/platform/iphone/os_iphone.cpp +++ b/platform/iphone/os_iphone.cpp @@ -31,7 +31,7 @@ #include "os_iphone.h" #include "drivers/gles2/rasterizer_gles2.h" -#include "drivers/gles1/rasterizer_gles1.h" + #include "servers/visual/visual_server_raster.h" #include "servers/visual/visual_server_wrap_mt.h" @@ -52,7 +52,7 @@ int OSIPhone::get_video_driver_count() const { const char * OSIPhone::get_video_driver_name(int p_driver) const { - return "openglES"; + return "GLES2"; }; OSIPhone* OSIPhone::get_singleton() { @@ -106,13 +106,9 @@ void OSIPhone::initialize(const VideoMode& p_desired,int p_video_driver,int p_au supported_orientations |= ((GLOBAL_DEF("video_mode/allow_vertical", false)?1:0) << PortraitDown); supported_orientations |= ((GLOBAL_DEF("video_mode/allow_vertical_flipped", false)?1:0) << PortraitUp); -#ifdef GLES1_OVERRIDE - rasterizer = memnew( RasterizerGLES1 ); -#else rasterizer_gles22 = memnew( RasterizerGLES2(false, false, false) ); rasterizer = rasterizer_gles22; rasterizer_gles22->set_base_framebuffer(gl_view_base_fb); -#endif visual_server = memnew( VisualServerRaster(rasterizer) ); if (get_render_thread_mode() != RENDER_THREAD_UNSAFE) { |