Sync upstream 2026-08-20 - #5
Merged
Merged
Conversation
…copypaste Restrict Wine PlatformOpenURL() path to ver 8.16
…ingCommunity#112) * Fix null dereference when building a texture from memory The image constructor assigned the mip set to its parameter rather than to the member that PerformUpload reads, so `img` was still null by the time Upload dereferenced it. Any call to this constructor crashed. Assign to the member instead. --------- Co-authored-by: Jimmy Chang <jimmy@stbear.com.tw> Co-authored-by: Lars Viklund <zao@zao.se>
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
4 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.
Merges upstream commits:
macOS port verification
Upstream touched three fork-patched files. Merge was clean (no textual conflicts); verified all three fork signatures survived:
engine/render/r_texture.cpp— Clangstd::mincast fix +<thread>include (commit b0db3cc) — intact.engine/system/win/sys_main.cpp— Cmd→KEY_CTRL mapping on macOS (commit 810cc19) — intact.engine/system/win/sys_video.cpp— ANGLE Metal backend hint on macOS (commit e20e15f) — intact.No forward-porting needed; upstream's changes were structurally disjoint from the fork's additions in each file. No LuaJIT vcpkg-port re-versioning in this merge (P5 not triggered).
No C++ test suite in this repo — verification was via signature diffing plus the rebuild/smoke-test that follows this PR.