[Merged by Bors] - Ensure 2D phase items are sorted before batching #5942
Conversation
Without this we can inappropriately merge batches together without properly accounting for non-batch items between them, and the merged batch will then be sorted incorrectly later.
alice-i-cecile
added
C-Bug
|
Does it make sense to batch a not sorted phase? If not, could the batch system sort by default before batching, and we could remove the independent sort system when batching? |
|
I was digging through the code that added this (#3460) to try and answer that, and it looks like these systems were originally ordered as I've done here, which was lost in the camera driven rendering rework (#4745). I can't see any discussion about why the systems are separate, and the later removal of the ordering appears to have been accidental when the code was moved (no mention of it in any discussion I could see). |
|
Thanks for the digging. Merging as trivial then; seems like a merge conflict error or something similiarly trivial. bors r+ |
# Objective Without this we can inappropriately merge batches together without properly accounting for non-batch items between them, and the merged batch will then be sorted incorrectly later. This change seems to reliably fix the issue I was seeing in #5919. ## Solution Ensure the `batch_phase_system` runs after the `sort_phase_system`, so that batching can only look at actually adjacent phase items.
|
Pull request successfully merged into main. Build succeeded: |
bors
bot
changed the title
|
For historical context, I’d have approved this too. |
|
@superdump does it make sense to merge those two systems in one when batching? that would remove the code of having two systems to call, both iterating the same list |
# Objective Without this we can inappropriately merge batches together without properly accounting for non-batch items between them, and the merged batch will then be sorted incorrectly later. This change seems to reliably fix the issue I was seeing in bevyengine#5919. ## Solution Ensure the `batch_phase_system` runs after the `sort_phase_system`, so that batching can only look at actually adjacent phase items.
# Objective Without this we can inappropriately merge batches together without properly accounting for non-batch items between them, and the merged batch will then be sorted incorrectly later. This change seems to reliably fix the issue I was seeing in bevyengine#5919. ## Solution Ensure the `batch_phase_system` runs after the `sort_phase_system`, so that batching can only look at actually adjacent phase items.
# Objective Without this we can inappropriately merge batches together without properly accounting for non-batch items between them, and the merged batch will then be sorted incorrectly later. This change seems to reliably fix the issue I was seeing in bevyengine#5919. ## Solution Ensure the `batch_phase_system` runs after the `sort_phase_system`, so that batching can only look at actually adjacent phase items.
Objective
Without this we can inappropriately merge batches together without properly accounting for non-batch items between them, and the merged batch will then be sorted incorrectly later.
This change seems to reliably fix the issue I was seeing in #5919.
Solution
Ensure the
batch_phase_systemruns after thesort_phase_system, so that batching can only look at actually adjacent phase items.