Fix GLES3 new batch condition on adding to batch #107319
Draft
+1
−1
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kleonc
added
bug
topic:rendering
crash
topic:2d
cherrypick:4.4
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #107297.
AFAICT both
r_indexandstate.last_item_indexused in the changed condition are actual item counts (they're one past the last used index; they start at0, not-1). Meaningr_index + state.last_item_indexis a valid item count and doesn't need to trigger new buffer creation.Haven't dived much deeper but seems like this led to some index mismatching elsewhere, as the change fixes the crash for me. Absolutely not very familiar with that batching code so @clayjohn please check thoroughly. 🙂
Update: this seems to actually not fix the issue (#107297 (comment)), will need to dig deeper.