summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
authorBastiaanOlij <mux213@gmail.com>2017-07-25 08:29:48 +1000
committerBastiaanOlij <mux213@gmail.com>2017-07-25 08:29:48 +1000
commit3bfdc583cb002c491f422d393acec7590c981ce3 (patch)
tree890cbc6f3fc3916579740843ea7180bc33dcc946 /platform
parente15a0c52437d1a3be1128641c33b994624e6bfe9 (diff)
Fixed setting our system_fbo framebuffer
Diffstat (limited to 'platform')
-rw-r--r--platform/iphone/os_iphone.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/platform/iphone/os_iphone.cpp b/platform/iphone/os_iphone.cpp
index 1329c94198..cb5c022764 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;
};