Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-12-15 23:53:15 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #43818 from lawnjelly/back_buffer_fix

Browse Source 
Batching - BackBuffer copy fix
This commit is contained in:
Rémi Verschelde 2020-11-25 08:26:20 +01:00 committed by GitHub
commit 83f7c2d957
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gles2/rasterizer_canvas_gles2.cpp
View File

@ -1946,10 +1946,6 @@ void RasterizerCanvasGLES2::render_joined_item(const BItemJoined &p_bij, RenderI
} }
#endif #endif
// this must be reset for each joined item,
// it only exists to prevent capturing the screen more than once per item
state.canvas_texscreen_used = false;
// all the joined items will share the same state with the first item // all the joined items will share the same state with the first item
Item *ci = bdata.item_refs[p_bij.first_item_ref].item; Item *ci = bdata.item_refs[p_bij.first_item_ref].item;

4
drivers/gles3/rasterizer_canvas_gles3.cpp
View File

@ -1203,10 +1203,6 @@ void RasterizerCanvasGLES3::render_joined_item(const BItemJoined &p_bij, RenderI
} }
#endif #endif
// this must be reset for each joined item,
// it only exists to prevent capturing the screen more than once per item
state.canvas_texscreen_used = false;
// all the joined items will share the same state with the first item // all the joined items will share the same state with the first item
Item *p_ci = bdata.item_refs[p_bij.first_item_ref].item; Item *p_ci = bdata.item_refs[p_bij.first_item_ref].item;

5
drivers/gles_common/rasterizer_canvas_batcher.h
View File

@ -3048,6 +3048,11 @@ PREAMBLE(bool)::_detect_item_batch_break(RenderItemState &r_ris, RasterizerCanva
} // else } // else
// special case, back buffer copy, so don't join
if (p_ci->copy_back_buffer) {
return true;
}
return false; return false;
} }