Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

More low priority redraw request cases #61965

Merged
merged 1 commit into from
Jun 12, 2022
Merged

More low priority redraw request cases #61965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions drivers/gles2/rasterizer_canvas_base_gles2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ RasterizerStorageGLES2::Texture *RasterizerCanvasBaseGLES2::_bind_canvas_texture

} else {
if (texture->redraw_if_visible) {
VisualServerRaster::redraw_request();
VisualServerRaster::redraw_request(false);
}

texture = texture->get_ptr();
Expand Down Expand Up @@ -236,7 +236,7 @@ RasterizerStorageGLES2::Texture *RasterizerCanvasBaseGLES2::_bind_canvas_texture

} else {
if (normal_map->redraw_if_visible) { //check before proxy, because this is usually used with proxies
VisualServerRaster::redraw_request();
VisualServerRaster::redraw_request(false);
}

normal_map = normal_map->get_ptr();
Expand Down
4 changes: 2 additions & 2 deletions drivers/gles2/rasterizer_canvas_gles2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1697,7 +1697,7 @@ void RasterizerCanvasGLES2::_legacy_canvas_render_item(Item *p_ci, RenderItemSta
}

if (t->redraw_if_visible) {
VisualServerRaster::redraw_request();
VisualServerRaster::redraw_request(false);
}

t = t->get_ptr();
Expand Down Expand Up @@ -2059,7 +2059,7 @@ void RasterizerCanvasGLES2::render_joined_item(const BItemJoined &p_bij, RenderI
}

if (t->redraw_if_visible) {
VisualServerRaster::redraw_request();
VisualServerRaster::redraw_request(false);
}

t = t->get_ptr();
Expand Down
4 changes: 2 additions & 2 deletions drivers/gles2/rasterizer_scene_gles2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1435,7 +1435,7 @@ bool RasterizerSceneGLES2::_setup_material(RasterizerStorageGLES2::Material *p_m
}

if (t->redraw_if_visible) { //must check before proxy because this is often used with proxies
VisualServerRaster::redraw_request();
VisualServerRaster::redraw_request(false);
}

t = t->get_ptr();
Expand Down Expand Up @@ -1812,7 +1812,7 @@ void RasterizerSceneGLES2::_render_geometry(RenderList::Element *p_element) {
RasterizerStorageGLES2::Texture *t = storage->texture_owner.get(c.texture);

if (t->redraw_if_visible) {
VisualServerRaster::redraw_request();
VisualServerRaster::redraw_request(false);
}
t = t->get_ptr();

Expand Down
4 changes: 2 additions & 2 deletions drivers/gles3/rasterizer_canvas_base_gles3.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ RasterizerStorageGLES3::Texture *RasterizerCanvasBaseGLES3::_bind_canvas_texture

} else {
if (texture->redraw_if_visible) { //check before proxy, because this is usually used with proxies
VisualServerRaster::redraw_request();
VisualServerRaster::redraw_request(false);
}

texture = texture->get_ptr();
Expand Down Expand Up @@ -265,7 +265,7 @@ RasterizerStorageGLES3::Texture *RasterizerCanvasBaseGLES3::_bind_canvas_texture

} else {
if (normal_map->redraw_if_visible) { //check before proxy, because this is usually used with proxies
VisualServerRaster::redraw_request();
VisualServerRaster::redraw_request(false);
}

normal_map = normal_map->get_ptr();
Expand Down
2 changes: 1 addition & 1 deletion drivers/gles3/rasterizer_canvas_gles3.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1292,7 +1292,7 @@ void RasterizerCanvasGLES3::render_joined_item(const BItemJoined &p_bij, RenderI
}

if (t->redraw_if_visible) { //check before proxy, because this is usually used with proxies
VisualServerRaster::redraw_request();
VisualServerRaster::redraw_request(false);
}

t = t->get_ptr();
Expand Down
4 changes: 2 additions & 2 deletions drivers/gles3/rasterizer_scene_gles3.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1161,7 +1161,7 @@ bool RasterizerSceneGLES3::_setup_material(RasterizerStorageGLES3::Material *p_m

if (t) {
if (t->redraw_if_visible) { //must check before proxy because this is often used with proxies
VisualServerRaster::redraw_request();
VisualServerRaster::redraw_request(false);
}

t = t->get_ptr(); //resolve for proxies
Expand Down Expand Up @@ -1569,7 +1569,7 @@ void RasterizerSceneGLES3::_render_geometry(RenderList::Element *e) {
RasterizerStorageGLES3::Texture *t = storage->texture_owner.get(c.texture);

if (t->redraw_if_visible) {
VisualServerRaster::redraw_request();
VisualServerRaster::redraw_request(false);
}
t = t->get_ptr(); //resolve for proxies

Expand Down
2 changes: 1 addition & 1 deletion servers/visual/visual_server_scene.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3298,7 +3298,7 @@ bool VisualServerScene::_render_reflection_probe_step(Instance *p_instance, int
Scenario *scenario = p_instance->scenario;
ERR_FAIL_COND_V(!scenario, true);

VisualServerRaster::redraw_request(); //update, so it updates in editor
VisualServerRaster::redraw_request(false); //update, so it updates in editor

if (p_step == 0) {
if (!VSG::scene_render->reflection_probe_instance_begin_render(reflection_probe->instance, scenario->reflection_atlas)) {
Expand Down