Add support for SDL-compatible joypad GUID on Android #114338
+184
−15
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This was referenced Dec 26, 2025
Nintorch
commented
Dec 26, 2025
| if (p_connected) { | ||
| if (p_vendor_id != 0 && p_product_id != 0) { | ||
| // Generate GUID for compatibility with SDL controller mappings. | ||
| sprintf(uid, "%04x%04x%04x%04x%04x%04x%04x%04x", BSWAP16(5), 0, BSWAP16(p_vendor_id), 0, BSWAP16(p_product_id), 0, BSWAP16(p_button_mask), BSWAP16(p_axis_mask)); |
Contributor
Author
There was a problem hiding this comment.
Suggested change
| sprintf(uid, "%04x%04x%04x%04x%04x%04x%04x%04x", BSWAP16(5), 0, BSWAP16(p_vendor_id), 0, BSWAP16(p_product_id), 0, BSWAP16(p_button_mask), BSWAP16(p_axis_mask)); | |
| sprintf(uid, "05000000%04x0000%04x0000%04x%04x", BSWAP16(p_vendor_id), BSWAP16(p_product_id), BSWAP16(p_button_mask), BSWAP16(p_axis_mask)); |
| } | ||
| } | ||
|
|
||
| int getAxisMask(List<InputDevice.MotionRange> ranges) { |
Contributor
Author
There was a problem hiding this comment.
// getAxisMask() and getButtonMask() were taken from SDL source code to make joypad GUIDs compatible with SDL
de7dcb7 to
07288ea
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hopefully fixes #56181 (if not, then we need to create a mapping for Xbox controllers ourselves)
This PR adds support for SDL-compatible joypad GUIDs on Android, so now we should be able to use SDL controller mapping database for Android controllers.
This PR adds support for
Input.get_joy_info()for Android as well.See also SDL's
Android_AddJoystick, SDL'sSDLControllerManager, and the way GUID was constructed in Godot's Linux joypad driver prior to the SDL3 joystick driver PR here.DualShock 4 GUID before this PR
(Ignore that there's no fingerprint sensor here, it's a screenshot with a different PR applied)
DualShock 4 GUID after this PR + Input.get_joy_info()