Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[emscripten] Fixes for data addresses above 2gb #11127

Merged
merged 1 commit into from
Oct 8, 2024

Conversation

sbc100
Copy link
Contributor

@sbc100 sbc100 commented Oct 8, 2024

This includes both wasm64 and wasm32 when addressing more than 2gb of memory.

Fixes: #9052

This includes both wasm64 and wasm32 when addressing more than 2gb of
memory.

Fixes: libsdl-org#9052
@sbc100
Copy link
Contributor Author

sbc100 commented Oct 8, 2024

I did this work against the SDL2 branch so that I could test it in the emscripten repo. Would it be reasonable to land this here first and the forward-port the patch to SDL3(main)?

@slouken slouken requested a review from icculus October 8, 2024 19:07
Copy link
Collaborator

@slouken slouken left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, that's fine. These changes look good to me, @icculus?

@icculus icculus merged commit 3deb07e into libsdl-org:SDL2 Oct 8, 2024
40 checks passed
@icculus
Copy link
Collaborator

icculus commented Oct 8, 2024

I'll merge this into SDL3 after dinner, if no one else beats me to it.

@icculus
Copy link
Collaborator

icculus commented Oct 8, 2024

Okay, merged to SDL3 in 02434cd, thanks!

@sbc100
Copy link
Contributor Author

sbc100 commented Oct 8, 2024

Is there any chance that an SDL2 release or tag is coming any time soon? Emscripten is currently setup to pull from a tag in this repo and I'd love to pull in these changes. Perhaps you could do a "prerelease" tag?

@slouken
Copy link
Collaborator

slouken commented Oct 8, 2024

Is there any chance that an SDL2 release or tag is coming any time soon? Emscripten is currently setup to pull from a tag in this repo and I'd love to pull in these changes. Perhaps you could do a "prerelease" tag?

I just pulled these changes into the release-2.30.x branch, which will be released on 11/1. You're welcome to use that as a prerelease tag if you want. It's getting minimal safe changes, so it should be fine to use until the 2.32 release.

@sbc100
Copy link
Contributor Author

sbc100 commented Oct 8, 2024

Any chance you could tag release-2.30.x as prerelease-2.30.9 now or is that not how it works?

@slouken
Copy link
Collaborator

slouken commented Oct 8, 2024

No, that's not how that works.

sbc100 added a commit to sbc100/emscripten that referenced this pull request Oct 8, 2024
This is in anticipation of libsdl-org/SDL#11127
landing in the next SDL2 release.
sbc100 added a commit to sbc100/emscripten that referenced this pull request Oct 8, 2024
This is in anticipation of libsdl-org/SDL#11127
landing in the next SDL2 release.
sbc100 added a commit to sbc100/emscripten that referenced this pull request Oct 9, 2024
This is in anticipation of libsdl-org/SDL#11127
landing in the next SDL2 release.
sbc100 added a commit to emscripten-core/emscripten that referenced this pull request Oct 9, 2024
This is in anticipation of libsdl-org/SDL#11127
landing in the next SDL2 release.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants