asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/okamstudio/godot

Browse source
This commit is contained in:
Juan Linietsky 2015-09-12 10:56:13 -03:00
commit 89a901c4b6
5 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/gles2/rasterizer_gles2.cpp
View file

@ -11188,6 +11188,12 @@ RasterizerGLES2::RasterizerGLES2(bool p_compress_arrays,bool p_keep_ram_copy,boo
tc0_idx=0;
};
void RasterizerGLES2::restore_framebuffer() {
glBindFramebuffer(GL_FRAMEBUFFER, base_framebuffer);
}
RasterizerGLES2::~RasterizerGLES2() {
memdelete_arr(skinned_buffer);

2
drivers/gles2/rasterizer_gles2.h
View file

@ -1695,6 +1695,8 @@ public:
void reload_vram();
virtual bool has_feature(VS::Features p_feature) const;
virtual void restore_framebuffer();
static RasterizerGLES2* get_singleton();

2
platform/iphone/gl_view.mm
View file

@ -345,6 +345,8 @@ static void clear_touches() {
[self destroyFramebuffer];
[self createFramebuffer];
[self drawView];
[self drawView];
}
- (BOOL)createFramebuffer

1
servers/visual/rasterizer.h
View file

@ -1022,6 +1022,7 @@ public:
virtual bool has_feature(VS::Features p_feature) const=0;
virtual void restore_framebuffer()=0;
virtual int get_render_info(VS::RenderInfo p_info)=0;

2
servers/visual/visual_server_raster.cpp
View file

@ -7427,6 +7427,8 @@ void VisualServerRaster::set_boot_image(const Image& p_image, const Color& p_col
if (p_image.empty())
return;
rasterizer->restore_framebuffer();
rasterizer->begin_frame();
int window_w = OS::get_singleton()->get_video_mode(0).width;