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

Ensure texture hints are obeyed, fixes #24875

Browse Source
This commit is contained in:
Juan Linietsky 2019-01-16 00:37:00 -03:00
parent 96445cd90e
commit ffcb5cd18c
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/gles2/rasterizer_canvas_gles2.cpp
View File

@ -1303,6 +1303,14 @@ void RasterizerCanvasGLES2::canvas_render_items(Item *p_item_list, int p_z, cons
t = t->get_ptr(); t = t->get_ptr();
#ifdef TOOLS_ENABLED
if (t->detect_normal && texture_hints[i] == ShaderLanguage::ShaderNode::Uniform::HINT_NORMAL) {
t->detect_normal(t->detect_normal_ud);
}
#endif
if (t->render_target)
t->render_target->used_in_frame = true;
if (t->redraw_if_visible) { if (t->redraw_if_visible) {
VisualServerRaster::redraw_request(); VisualServerRaster::redraw_request();
} }

18
drivers/gles2/rasterizer_scene_gles2.cpp
View File

@ -1245,6 +1245,24 @@ bool RasterizerSceneGLES2::_setup_material(RasterizerStorageGLES2::Material *p_m
t = t->get_ptr(); t = t->get_ptr();
if (t->redraw_if_visible) { //must check before proxy because this is often used with proxies
VisualServerRaster::redraw_request();
}
#ifdef TOOLS_ENABLED
if (t->detect_3d) {
t->detect_3d(t->detect_3d_ud);
}
#endif
#ifdef TOOLS_ENABLED
if (t->detect_normal && texture_hints[i] == ShaderLanguage::ShaderNode::Uniform::HINT_NORMAL) {
t->detect_normal(t->detect_normal_ud);
}
#endif
if (t->render_target)
t->render_target->used_in_frame = true;
glBindTexture(t->target, t->tex_id); glBindTexture(t->target, t->tex_id);
if (i == 0) { if (i == 0) {
state.current_main_tex = t->tex_id; state.current_main_tex = t->tex_id;