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

Merge pull request #65794 from Geometror/fix-canvas-backbuffer 

Fix/restore BackBufferCopy
This commit is contained in:
Rémi Verschelde 2022-09-16 09:20:04 +02:00
parent 16d44395b5 e235bca995
commit 848668ed45
3 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/gles3/rasterizer_canvas_gles3.cpp
View File

@ -198,7 +198,8 @@ void RasterizerCanvasGLES3::canvas_render_items(RID p_to_render_target, Item *p_
int item_count = 0;
bool backbuffer_cleared = false;
bool time_used = false;
bool material_screen_texture_found = false;
bool material_screen_texture_cached = false;
bool material_screen_texture_mipmaps_cached = false;
Rect2 back_buffer_rect;
bool backbuffer_copy = false;
bool backbuffer_gen_mipmaps = false;
@ -223,10 +224,12 @@ void RasterizerCanvasGLES3::canvas_render_items(RID p_to_render_target, Item *p_
GLES3::CanvasMaterialData *md = static_cast<GLES3::CanvasMaterialData *>(material_storage->material_get_data(material, RS::SHADER_CANVAS_ITEM));
if (md && md->shader_data->valid) {
if (md->shader_data->uses_screen_texture && canvas_group_owner == nullptr) {
if (!material_screen_texture_found) {
if (!material_screen_texture_cached) {
backbuffer_copy = true;
back_buffer_rect = Rect2();
backbuffer_gen_mipmaps = md->shader_data->uses_screen_texture_mipmaps;
} else if (!material_screen_texture_mipmaps_cached) {
backbuffer_gen_mipmaps = md->shader_data->uses_screen_texture_mipmaps;
}
}
@ -287,7 +290,16 @@ void RasterizerCanvasGLES3::canvas_render_items(RID p_to_render_target, Item *p_
texture_storage->render_target_copy_to_back_buffer(p_to_render_target, back_buffer_rect, backbuffer_gen_mipmaps);
backbuffer_copy = false;
material_screen_texture_found = true; //after a backbuffer copy, screen texture makes no further copies
backbuffer_gen_mipmaps = false;
material_screen_texture_cached = true; // After a backbuffer copy, screen texture makes no further copies.
material_screen_texture_mipmaps_cached = backbuffer_gen_mipmaps;
}
if (backbuffer_gen_mipmaps) {
texture_storage->render_target_gen_back_buffer_mipmaps(p_to_render_target, back_buffer_rect);
backbuffer_gen_mipmaps = false;
material_screen_texture_mipmaps_cached = true;
}
// just add all items for now

2
servers/rendering/renderer_canvas_cull.cpp
View File

@ -189,7 +189,7 @@ void RendererCanvasCull::_attach_canvas_item_for_draw(RendererCanvasCull::Item *
RenderingServerDefault::redraw_request();
}
if (ci->commands != nullptr) {
if (ci->commands != nullptr || ci->copy_back_buffer) {
ci->final_transform = xform;
ci->final_modulate = modulate * ci->self_modulate;
ci->global_rect_cache = global_rect;

21
servers/rendering/renderer_rd/renderer_canvas_render_rd.cpp
View File

@ -1362,9 +1362,12 @@ void RendererCanvasRenderRD::canvas_render_items(RID p_to_render_target, Item *p
default_repeat = p_default_repeat;
}
//fill the list until rendering is possible.
bool material_screen_texture_found = false;
Item *ci = p_item_list;
//fill the list until rendering is possible.
bool material_screen_texture_cached = false;
bool material_screen_texture_mipmaps_cached = false;
Rect2 back_buffer_rect;
bool backbuffer_copy = false;
bool backbuffer_gen_mipmaps = false;
@ -1393,10 +1396,12 @@ void RendererCanvasRenderRD::canvas_render_items(RID p_to_render_target, Item *p
CanvasMaterialData *md = static_cast<CanvasMaterialData *>(material_storage->material_get_data(material, RendererRD::MaterialStorage::SHADER_TYPE_2D));
if (md && md->shader_data->valid) {
if (md->shader_data->uses_screen_texture && canvas_group_owner == nullptr) {
if (!material_screen_texture_found) {
if (!material_screen_texture_cached) {
backbuffer_copy = true;
back_buffer_rect = Rect2();
backbuffer_gen_mipmaps = md->shader_data->uses_screen_texture_mipmaps;
} else if (!material_screen_texture_mipmaps_cached) {
backbuffer_gen_mipmaps = md->shader_data->uses_screen_texture_mipmaps;
}
}
@ -1486,7 +1491,15 @@ void RendererCanvasRenderRD::canvas_render_items(RID p_to_render_target, Item *p
backbuffer_copy = false;
backbuffer_gen_mipmaps = false;
material_screen_texture_found = true; //after a backbuffer copy, screen texture makes no further copies
material_screen_texture_cached = true; // After a backbuffer copy, screen texture makes no further copies.
material_screen_texture_mipmaps_cached = backbuffer_gen_mipmaps;
}
if (backbuffer_gen_mipmaps) {
texture_storage->render_target_gen_back_buffer_mipmaps(p_to_render_target, back_buffer_rect);
backbuffer_gen_mipmaps = false;
material_screen_texture_mipmaps_cached = true;
}
items[item_count++] = ci;