Skip to content

Fix SDL event capacity narrowing in Windows Dolphin builds #76

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

Closed
jmonster wants to merge 1 commit into from
Closed

Fix SDL event capacity narrowing in Windows Dolphin builds #76

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
6 changes: 4 additions & 2 deletions Integrations/SDL3/Switch2KitSDL3.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,9 +465,11 @@ struct SDL3Adapter::Impl {
lastPump = now; wasActive = active;
// SDL first expires finished effects; renewal below must not resurrect one.
SDL_UpdateJoysticks();
std::array<S2KEvent, S2K_EVENT_CAPACITY> events{};
// Match the C ABI width and the backing array without implicit narrowing.
constexpr uint32_t eventCapacity{S2K_EVENT_CAPACITY};
std::array<S2KEvent, eventCapacity> events{};
uint32_t count{}, flags{};
const auto result = s2k_read(context, events.data(), events.size(), sizeof(S2KEvent), &count,
const auto result = s2k_read(context, events.data(), eventCapacity, sizeof(S2KEvent), &count,
&snapshot, sizeof(snapshot), &flags);
if (result != S2K_OK) { clear(); return error = result; }
const auto clock = ClockPair::sample();
Expand Down
Loading