Skip to content

Remove unused JoypadSDL::singleton #115952

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
Repiteo merged 1 commit into from
Feb 6, 2026
Merged

Remove unused JoypadSDL::singleton #115952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 0 additions & 11 deletions drivers/sdl/joypad_sdl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,19 +43,13 @@
#include <SDL3/SDL_iostream.h>
#include <SDL3/SDL_joystick.h>

JoypadSDL *JoypadSDL::singleton = nullptr;

// Macro to skip the SDL joystick event handling if the device is an SDL gamepad, because
// there are separate events for SDL gamepads
#define SKIP_EVENT_FOR_GAMEPAD \
if (SDL_IsGamepad(sdl_event.jdevice.which)) { \
continue; \
}

JoypadSDL::JoypadSDL() {
singleton = this;
}

JoypadSDL::~JoypadSDL() {
// Process any remaining input events
process_events();
Expand All @@ -65,11 +59,6 @@ JoypadSDL::~JoypadSDL() {
}
}
SDL_Quit();
singleton = nullptr;
}

JoypadSDL *JoypadSDL::get_singleton() {
return singleton;
}

Error JoypadSDL::initialize() {
Expand Down
5 changes: 0 additions & 5 deletions drivers/sdl/joypad_sdl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,8 @@ typedef struct SDL_Gamepad SDL_Gamepad;

class JoypadSDL {
public:
JoypadSDL();
~JoypadSDL();

static JoypadSDL *get_singleton();

Error initialize();
void process_events();

Expand All @@ -69,8 +66,6 @@ class JoypadSDL {
SDL_Gamepad *get_sdl_gamepad() const;
};

static JoypadSDL *singleton;

Joypad joypads[Input::JOYPADS_MAX];
HashMap<SDL_JoystickID, int> sdl_instance_id_to_joypad_id;

Expand Down