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

Use struct info in src/library_sdl.js. NFC #22885

Merged
merged 1 commit into from
Nov 13, 2024

Conversation

sbc100
Copy link
Collaborator

@sbc100 sbc100 commented Nov 8, 2024

No description provided.

@@ -348,13 +348,13 @@ var LibrarySDL = {
translateRGBAToColor: (r, g, b, a) => r | g << 8 | b << 16 | a << 24,

makeSurface(width, height, flags, usePageCanvas, source, rmask, gmask, bmask, amask) {
var is_SDL_HWSURFACE = flags & 0x00000001;
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

It looks like SDL_HWSURFACE constant was wrong here. It should have been 0x08000001. Luckily it was still matching because its a subset of the bits.

@sbc100 sbc100 requested a review from kripken November 8, 2024 01:07
Copy link
Member

@kripken kripken left a comment

Choose a reason for hiding this comment

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

We have some testing of this, but I'm not sure how much. Might be worth checking.

@sbc100
Copy link
Collaborator Author

sbc100 commented Nov 12, 2024

We have some testing of this, but I'm not sure how much. Might be worth checking.

We have tests at least the keyboard stuff because I made a mistake there and they failed. I double checked everything again and I think we are good now.

@sbc100 sbc100 enabled auto-merge (squash) November 12, 2024 22:38
@sbc100 sbc100 disabled auto-merge November 13, 2024 00:07
@sbc100 sbc100 merged commit c1540c3 into emscripten-core:main Nov 13, 2024
26 of 28 checks passed
@sbc100 sbc100 deleted the sdl_struct_info branch November 13, 2024 00:07
sbc100 added a commit to sbc100/emscripten that referenced this pull request Nov 13, 2024
sbc100 added a commit that referenced this pull request Nov 13, 2024
uysalibov pushed a commit to uysalibov/emscripten that referenced this pull request Nov 15, 2024
uysalibov pushed a commit to uysalibov/emscripten that referenced this pull request Nov 15, 2024
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.

2 participants