glsl_restart: Stop segfaulting#1926
Merged
illwieckz merged 2 commits intofor-0.56.0/syncfrom Mar 9, 2026
Merged
Conversation
Using git bisect, e497a08 introduces a window where globalUBOProxy can be null after glsl_restart. Therefore, also return early, if glboalUBOProxy is null. It will be instantiated later. Further, only initialize world shaders *AFTER* all shader storage has been initialized.
illwieckz
force-pushed
the
illwieckz/fix-segfault
branch
from
c1dc4c0 to
b77e924
Compare
Member
Author
|
The original commit was introducing some whitespace change in other parts, I split that in another commit. |
illwieckz
commented
Mar 9, 2026
Member
Author
illwieckz
left a comment
illwieckz
left a comment
There was a problem hiding this comment.
I'm reviewing someone else's work here, so LGTM.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Cherry-picked from:
While the rest of that PR can wait for after the release, this commit fixes an actual bug we better not want to ship.
@DolceTriade told me:
I verified the bug affects 0.56.0 too and that this commit fixes it.
Original commit comment below.
Using git bisect, e497a08 introduces a window where globalUBOProxy can be null after glsl_restart. Therefore, also return early, if glboalUBOProxy is null. It will be instantiated later.
Further, only initialize world shaders AFTER all shader storage has been initialized.