asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix ninepatch batch break logic.

Browse source 
I'd forgotten to add check for need for a new batch. Fixes visual anomalies, particularly tab container.
This commit is contained in:
lawnjelly 2020-11-30 10:29:52 +00:00
parent 803f6d2388
commit 4c588c21e8
1 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
drivers/gles_common/rasterizer_canvas_batcher.h
View file

@ -792,6 +792,8 @@ PREAMBLE(void)::_prefill_default_batch(FillState &r_fill_state, int p_command_nu
if (!r_fill_state.transform_extra_command_number_p1) { if (!r_fill_state.transform_extra_command_number_p1) {
// another default command, just add to the existing batch // another default command, just add to the existing batch
r_fill_state.curr_batch->num_commands++; r_fill_state.curr_batch->num_commands++;
RAST_DEV_DEBUG_ASSERT(r_fill_state.curr_batch->num_commands <= p_command_num);
} else { } else {
#if defined(TOOLS_ENABLED) && defined(DEBUG_ENABLED) #if defined(TOOLS_ENABLED) && defined(DEBUG_ENABLED)
if (r_fill_state.transform_extra_command_number_p1 != p_command_num) { if (r_fill_state.transform_extra_command_number_p1 != p_command_num) {
@ -1355,6 +1357,17 @@ template <bool SEND_LIGHT_ANGLES>
bool C_PREAMBLE::_prefill_ninepatch(RasterizerCanvas::Item::CommandNinePatch *p_np, FillState &r_fill_state, int &r_command_start, int command_num, int command_count, RasterizerCanvas::Item *p_item, bool multiply_final_modulate) { bool C_PREAMBLE::_prefill_ninepatch(RasterizerCanvas::Item::CommandNinePatch *p_np, FillState &r_fill_state, int &r_command_start, int command_num, int command_count, RasterizerCanvas::Item *p_item, bool multiply_final_modulate) {
typename T_STORAGE::Texture *tex = get_storage()->texture_owner.getornull(p_np->texture); typename T_STORAGE::Texture *tex = get_storage()->texture_owner.getornull(p_np->texture);
// conditions for creating a new batch
if (r_fill_state.curr_batch->type != RasterizerStorageCommon::BT_RECT) {
// don't allow joining to a different sequence type
if (r_fill_state.sequence_batch_type_flags & (~RasterizerStorageCommon::BTF_RECT)) {
// don't allow joining to a different sequence type
r_command_start = command_num;
return true;
}
}
if (!tex) { if (!tex) {
// FIXME: Handle textureless ninepatch gracefully // FIXME: Handle textureless ninepatch gracefully
WARN_PRINT("NinePatch without texture not supported yet in GLES2 backend, skipping."); WARN_PRINT("NinePatch without texture not supported yet in GLES2 backend, skipping.");