diff options
| author | Rémi Verschelde | 2017-07-26 07:51:20 +0200 |
|---|---|---|
| committer | GitHub | 2017-07-26 07:51:20 +0200 |
| commit | f55211ae0dc202cc015c247495af8e05af81b24b (patch) | |
| tree | da78c5a2629d5a38d6c32813bdd39e57983ae744 | |
| parent | 8e87d2e32ffdf398609b2b9c2b417b39be1f86b9 (diff) | |
| parent | 3bfdc583cb002c491f422d393acec7590c981ce3 (diff) | |
| download | godot-f55211ae0dc202cc015c247495af8e05af81b24b.tar.gz godot-f55211ae0dc202cc015c247495af8e05af81b24b.tar.zst godot-f55211ae0dc202cc015c247495af8e05af81b24b.zip | |
Merge pull request #9823 from BastiaanOlij/ios_fix_framebuffer_order
Fixed setting our system_fbo framebuffer
Diffstat (limited to '')
| -rw-r--r-- | platform/iphone/os_iphone.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/platform/iphone/os_iphone.cpp b/platform/iphone/os_iphone.cpp index 1329c9419..cb5c02276 100644 --- a/platform/iphone/os_iphone.cpp +++ b/platform/iphone/os_iphone.cpp @@ -109,7 +109,6 @@ void OSIPhone::initialize(const VideoMode &p_desired, int p_video_driver, int p_ RasterizerGLES3::register_config(); RasterizerGLES3::make_current(); - RasterizerStorageGLES3::system_fbo = gl_view_base_fb; visual_server = memnew(VisualServerRaster()); /* @@ -122,6 +121,9 @@ void OSIPhone::initialize(const VideoMode &p_desired, int p_video_driver, int p_ visual_server->init(); visual_server->cursor_set_visible(false, 0); + // reset this to what it should be, it will have been set to 0 after visual_server->init() is called + RasterizerStorageGLES3::system_fbo = gl_view_base_fb; + audio_driver = memnew(AudioDriverIphone); audio_driver->set_singleton(); audio_driver->init(); @@ -434,7 +436,8 @@ bool OSIPhone::can_draw() const { int OSIPhone::set_base_framebuffer(int p_fb) { - RasterizerStorageGLES3::system_fbo = gl_view_base_fb; + // gl_view_base_fb has not been updated yet + RasterizerStorageGLES3::system_fbo = p_fb; return 0; }; |