diff options
| author | hurikhan | 2015-01-11 08:06:31 +0800 |
|---|---|---|
| committer | hurikhan | 2015-01-11 08:06:31 +0800 |
| commit | 291d7992ceae487a63dc2d6eb1ee2da7312017c5 (patch) | |
| tree | 6bd0489107fa33477ccc7e7553c79d3001fe433a /platform/android/os_android.cpp | |
| parent | a8e3c5c0b7fb202bcceb06b9373b5b6a4ff8f9b8 (diff) | |
| parent | d30f4e52f654a26e14223a6ef9a946cc6282c0db (diff) | |
| download | godot-291d7992ceae487a63dc2d6eb1ee2da7312017c5.tar.gz godot-291d7992ceae487a63dc2d6eb1ee2da7312017c5.tar.zst godot-291d7992ceae487a63dc2d6eb1ee2da7312017c5.zip | |
Merge branch 'master' into x11-fullscreen
Diffstat (limited to 'platform/android/os_android.cpp')
| -rw-r--r-- | platform/android/os_android.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/platform/android/os_android.cpp b/platform/android/os_android.cpp index 833de059f..6f1c03b59 100644 --- a/platform/android/os_android.cpp +++ b/platform/android/os_android.cpp @@ -28,7 +28,7 @@ /*************************************************************************/ #include "os_android.h" #include "drivers/gles2/rasterizer_gles2.h" -#include "drivers/gles1/rasterizer_gles1.h" + #include "core/io/file_access_buffered_fa.h" #include "drivers/unix/file_access_unix.h" #include "drivers/unix/dir_access_unix.h" @@ -49,11 +49,11 @@ int OS_Android::get_video_driver_count() const { - return 2; + return 1; } const char * OS_Android::get_video_driver_name(int p_driver) const { - return p_driver==0?"GLES2":"GLES1"; + return "GLES2"; } OS::VideoMode OS_Android::get_default_video_mode() const { @@ -123,13 +123,13 @@ void OS_Android::initialize(const VideoMode& p_desired,int p_video_driver,int p_ AudioDriverManagerSW::add_driver(&audio_driver_android); - if (use_gl2) { + if (true) { RasterizerGLES2 *rasterizer_gles22=memnew( RasterizerGLES2(false,use_reload_hooks,false,use_reload_hooks ) ); if (gl_extensions) rasterizer_gles22->set_extensions(gl_extensions); rasterizer = rasterizer_gles22; } else { - rasterizer = memnew( RasterizerGLES1(use_reload_hooks, use_reload_hooks) ); + //rasterizer = memnew( RasterizerGLES1(use_reload_hooks, use_reload_hooks) ); } |