godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Proxies were being mishandled, leading to the now fixed #17651

Browse Source
This commit is contained in:
Juan Linietsky 2018-11-16 09:33:33 -03:00
parent 8306d60e85
commit 40e4f5bef4
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/gles3/rasterizer_canvas_gles3.cpp
View File

@ -213,12 +213,12 @@ RasterizerStorageGLES3::Texture *RasterizerCanvasGLES3::_bind_canvas_texture(con
} else { } else {
texture = texture->get_ptr();
if (texture->redraw_if_visible) { //check before proxy, because this is usually used with proxies if (texture->redraw_if_visible) { //check before proxy, because this is usually used with proxies
VisualServerRaster::redraw_request(); VisualServerRaster::redraw_request();
} }
texture = texture->get_ptr();
if (texture->render_target) if (texture->render_target)
texture->render_target->used_in_frame = true; texture->render_target->used_in_frame = true;
@ -254,11 +254,12 @@ RasterizerStorageGLES3::Texture *RasterizerCanvasGLES3::_bind_canvas_texture(con
} else { } else {
normal_map = normal_map->get_ptr();
if (normal_map->redraw_if_visible) { //check before proxy, because this is usually used with proxies if (normal_map->redraw_if_visible) { //check before proxy, because this is usually used with proxies
VisualServerRaster::redraw_request(); VisualServerRaster::redraw_request();
} }
normal_map = normal_map->get_ptr();
glActiveTexture(GL_TEXTURE1); glActiveTexture(GL_TEXTURE1);
glBindTexture(GL_TEXTURE_2D, normal_map->tex_id); glBindTexture(GL_TEXTURE_2D, normal_map->tex_id);
state.current_normal = p_normal_map; state.current_normal = p_normal_map;
@ -1385,12 +1386,12 @@ void RasterizerCanvasGLES3::canvas_render_items(Item *p_item_list, int p_z, cons
continue; continue;
} }
t = t->get_ptr();
if (t->redraw_if_visible) { //check before proxy, because this is usually used with proxies if (t->redraw_if_visible) { //check before proxy, because this is usually used with proxies
VisualServerRaster::redraw_request(); VisualServerRaster::redraw_request();
} }
t = t->get_ptr();
if (storage->config.srgb_decode_supported && t->using_srgb) { if (storage->config.srgb_decode_supported && t->using_srgb) {
//no srgb in 2D //no srgb in 2D
glTexParameteri(t->target, _TEXTURE_SRGB_DECODE_EXT, _SKIP_DECODE_EXT); glTexParameteri(t->target, _TEXTURE_SRGB_DECODE_EXT, _SKIP_DECODE_EXT);

3
drivers/gles3/rasterizer_scene_gles3.cpp
View File

@ -1190,11 +1190,12 @@ bool RasterizerSceneGLES3::_setup_material(RasterizerStorageGLES3::Material *p_m
if (t) { if (t) {
t = t->get_ptr(); //resolve for proxies
if (t->redraw_if_visible) { //must check before proxy because this is often used with proxies if (t->redraw_if_visible) { //must check before proxy because this is often used with proxies
VisualServerRaster::redraw_request(); VisualServerRaster::redraw_request();
} }
t = t->get_ptr(); //resolve for proxies
#ifdef TOOLS_ENABLED #ifdef TOOLS_ENABLED
if (t->detect_3d) { if (t->detect_3d) {
t->detect_3d(t->detect_3d_ud); t->detect_3d(t->detect_3d_ud);