diff options
| author | Juan Linietsky | 2015-01-13 11:23:05 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2015-01-13 11:23:05 -0300 |
| commit | 823d7ae3b554100fc35c6223568452c8fa7adf11 (patch) | |
| tree | c2feed7fcbf86d534dde179bcc2e1b924d0e2187 /platform/iphone/os_iphone.cpp | |
| parent | 7c7ab30c4ef74f3e7a90ab6d23d69d545fac7cf3 (diff) | |
| parent | 869f400179a32e951a44181165de48094693e280 (diff) | |
| download | godot-823d7ae3b554100fc35c6223568452c8fa7adf11.tar.gz godot-823d7ae3b554100fc35c6223568452c8fa7adf11.tar.zst godot-823d7ae3b554100fc35c6223568452c8fa7adf11.zip | |
Merge branch 'master' of https://github.com/okamstudio/godot
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) { |