Skip to content

[pull] master from mgba-emu:master #643

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.

Sign up for GitHub

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

Merged
pull merged 2 commits into from
Jan 30, 2026
Merged

[pull] master from mgba-emu:master #643

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d7c81f
Minor fixes for SDL3
CasualPokePlayer Jan 30, 2026
8a10fbf
SDL: Fix button name mapping on Switch Pro controllers
endrift Jan 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/platform/example/client-server/client.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ int main() {
#if SDL_VERSION_ATLEAST(3, 0, 0)
SDL_Window* window = SDL_CreateWindow(projectName, width, height, SDL_WINDOW_OPENGL);
SDL_Renderer* renderer = SDL_CreateRenderer(window, NULL);
SDL_SetRenderVSync(renderer, 1);
#else
SDL_Window* window = SDL_CreateWindow(projectName, SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, width, height, SDL_WINDOW_OPENGL);
SDL_Renderer* renderer = SDL_CreateRenderer(window, -1, SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC);
Expand Down
8 changes: 8 additions & 0 deletions src/platform/sdl/sdl-events.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ bool mSDLInitEvents(struct mSDLEvents* context) {
_mSDLOpenJoystick(context, ids[i]);
}
}
SDL_free(ids);
#else
SDL_JoystickEventState(SDL_ENABLE);
int nJoysticks = SDL_NumJoysticks();
Expand Down Expand Up @@ -983,10 +984,17 @@ static const char* const buttonNamesPlayStation[SDL_CONTROLLER_BUTTON_MAX] = {
};

static const char* const buttonNamesNintedo[SDL_CONTROLLER_BUTTON_MAX] = {
#if SDL_VERSION_ATLEAST(3, 0, 0)
[SDL_GAMEPAD_BUTTON_EAST] = "A",
[SDL_GAMEPAD_BUTTON_SOUTH] = "B",
[SDL_GAMEPAD_BUTTON_NORTH] = "X",
[SDL_GAMEPAD_BUTTON_WEST] = "Y",
#else
[SDL_CONTROLLER_BUTTON_A] = "A",
[SDL_CONTROLLER_BUTTON_B] = "B",
[SDL_CONTROLLER_BUTTON_X] = "X",
[SDL_CONTROLLER_BUTTON_Y] = "Y",
#endif
[SDL_CONTROLLER_BUTTON_BACK] = "-",
[SDL_CONTROLLER_BUTTON_GUIDE] = "Home",
[SDL_CONTROLLER_BUTTON_START] = "+",
Expand Down
1 change: 1 addition & 0 deletions src/platform/sdl/sw-sdl2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ bool mSDLSWInit(struct mSDLRenderer* renderer) {
#if SDL_VERSION_ATLEAST(3, 0, 0)
renderer->window = SDL_CreateWindow(projectName, renderer->viewportWidth, renderer->viewportHeight, SDL_WINDOW_FULLSCREEN * renderer->player.fullscreen);
renderer->sdlRenderer = SDL_CreateRenderer(renderer->window, NULL);
SDL_SetRenderVSync(renderer->sdlRenderer, 1);
#else
renderer->window = SDL_CreateWindow(projectName, SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, renderer->viewportWidth, renderer->viewportHeight, SDL_WINDOW_FULLSCREEN_DESKTOP * renderer->player.fullscreen);
renderer->sdlRenderer = SDL_CreateRenderer(renderer->window, -1, SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC);
Expand Down