mirror of
https://github.com/libretro/RetroArch.git
synced 2026-11-22 10:50:15 -10:00
codex/android-native-streaming
452
Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
|
|
e4b48e9f9b |
android: a second display's touch crosses JNI once per event
SecondDisplayController called native code and woke the app thread's looper once per finger for every MotionEvent. The pointers now go into a direct buffer shared with native code, packed as VIDEO_POS_PACK positions, and one nativeTouches() call reads them in place and wakes the looper once. The ring's records carry the packed position the poll stores, so it no longer packs them. |
||
|
|
d94e1409cd |
android: publish the mouse and every touch to the frontend
The touches on the main window and on the second display go to the frontend's pointer publication each poll, raw, each with the window it is in, and the publication answers the pointer, the screen pointer, the second display's pointer and a lightgun aimed by touch. The mouse stays the driver's: its motion and wheel are taken by each read, as before. Every answer is as it was; the pointer_frame test checks each one the publication gives against the driver's own answers before this change. Three things differ. Binds to the mouse's left, right and middle buttons now work: they never fired on Android. And a touch is placed at the first read after the poll instead of as its event came, so a finger held still while the viewport changes follows the change at once. And a tap on a main window that shows no screen is on nothing: it fires no lightgun button there, while a tap in the letterbox still does. |
||
|
|
78dda5539e |
android: drop the second display's key relay and focus count
The second display's Presentation never has the focus now, so it never receives a key or a stick move and never reports a focus change. Its key and motion relay, the ring that carried them to native code, its focus commands and its part in the focus count go: RetroArch's focus is its Activity's, as before the second display existed. |
||
|
|
5c82bce0ed |
overlay: D-pad and face buttons read a finger's contact area (Android)
A touchscreen reports each finger as an ellipse, not a point; Android gives its axes and orientation (AMotionEvent_getTouchMajor/Minor and getOrientation). A thumb laid across up and right, or resting between two face buttons, covers both - and read by its centre alone presses one. After RetroArch-Lite's contact-area input. "D-Pad Input Method" and "ABXY Input Method" choose how each reads a touch: "Direction" - the way the centre lies, as always, and the default - "Contact Area", every way the contact covers, or "Both". Each tip of the ellipse's two axes presses the way it lies from the area's middle, past a small dead zone there. "Contact Area Size" scales how large a contact counts. Measured in pixels per axis against the pointer's own space; RetroArch-Lite measured both against the screen's height, which skews a contact on a wide screen. Android's reader keeps each pointer's contact beside its position, and the driver hands them to the frontend each poll (input_driver_publish_touch_contacts). A finger with no contact size, and every other driver, read by the centre's way. The rows show on Android, where an overlay has the area they apply to. overlay_contact_test holds the geometry: fingertips, thumbs across two ways, upright and level contacts, magnification, wide screens. |
||
|
|
c430e3e927 |
android: an overlay press buzzes when pressed, not a frame later
The keypress haptic was held to the top of the next runloop iteration, up to a frame after the press: the press can come on a core's libco stack, where Java is not to be entered. A thread of its own - the shared output writer, attached to the JVM by rjni as it first asks - now makes the buzz the moment it is woken; waking it is no Java. The pending flag is an atomic, cleared by the lifecycle handlers as before, and the runloop still flushes it where there are no threads. |
||
|
|
17f017a0ff |
Android: a pen hovering does not hide the overlay; a setting keeps it
The on-screen overlay is hidden while a stylus is in use and comes back two seconds after it was last used. Any pen event counted, a pen merely hovering over the screen too, so the gamepad overlay went away as soon as an S-Pen came near it, and "Hide Overlay When Controller Is Connected" did not keep it (#19824). A hovering pen now counts only where hovering moves the pointer ("Stylus Hover Moves Cursor"); otherwise only a pen touching the screen does. And "Hide Overlay While Using Stylus", on by default, can be turned off to keep the overlay on screen while the pen is used, as melonDS does. |
||
|
|
b92a874a90 |
input: device groups, and Android's built-in controllers as rules
Some controllers reach the OS as more than one input device: the Xperia Play's pad is two, the SHIELD keeps its NVIDIA button apart, the GPD XD its back button, the ARCHOS GamePad its sticks. The Android driver merged them with two global ids, pad_id1 and pad_id2, in a chain of special cases: one such device at a time, two members at most, and nothing done when one went away. A device group (input/input_group.h) is one pad made of several OS devices. The first member to arrive has the slot, later ones are read as it, in either order. A member leaving keeps the pad; the lead leaving hands the slot to the next member; the last leaving ends the group. Several groups stand at once. A rule names the model, the members' names and each one's role: part of the pad, the controller proper (a second controller is a pad of its own), or a part that only joins, like the NVIDIA button. The Android driver's special cases are now a rule table (android_groups.h) and the two globals are gone. input_group_test holds the table to the old chain on every model and name it tries, and the groups to join orders, members leaving, two groups at once and roles. |
||
|
|
c6046da20f |
Android: read the input queue on a thread of its own (#19923)
* Android: read the input queue on a thread of its own Android sends a window its next key only once the window has finished the last one, and a NativeActivity gets every key twice: before the IME, marked AKEY_EVENT_FLAG_PREDISPATCH, and after it. Read on the main thread once a frame, with the first copy finished unhandled for the IME, each key took two polls, about 30 keys a second at 60 Hz. A pad mashed faster than that queued up in the system, and its presses kept arriving seconds after it was let go. A thread with its own looper now reads the queue. It copies each event into an SPSC ring and finishes it at once, so Android sends the next one straight away. The copy before the IME is the one read, unless the system keyboard is open, when keys still go by the IME first. Volume keys are left to the system and read once, after the IME. Until the first input driver starts, events are finished unread. With the ring full, the reader leaves events in the queue until the poll makes room. The poll applies the copies in order through the same handlers. A key, a finger or a mouse button can now go down and back up between two polls, so the poll stops at the first event that would undo what an earlier one did in the same poll and leaves the rest for the next (android_poll_changes.h): a press shorter than a frame is still seen for one. Mouse moves in one poll are summed. The reader answers APP_CMD_INPUT_CHANGED once it has let go of the old queue. The AMotionEvent calls looked up with dlsym are looked up once, before the reader starts, since it reads them too. Co-Authored-By: Claude Opus 5.5 <[email protected]> Claude-Session: https://claude.ai/code/session_01YTBjv1trXRxAXvNwCt89Ka * Android input reader: records of their own size, read where they lie Each event went through the input reader's ring as a 312-byte record, whatever it was, built on the reader's stack, copied into the ring and copied out again by the poll. A key needs 44 bytes of it and a stick's move 88. A record is now as long as its event: a key ends before the stick axes, a stick's move before the touch fields, and a touch, mouse or pen carries only the pointers it has. The reader builds each where the poll will read it, and the poll applies it there (android_input_ring.h); nothing is copied after the event leaves the input queue. A record never crosses the ring's end: the rest of a lap is a pad the poll steps over. The ring is 64 KiB, some 1500 keys. A stick's moves are its state: the poll keeps only the last of a frame. The reader publishes what it writes once the queue is empty, and a stick's move written over its unpublished move before it, as long as the hat stays where it was, so a fast pad no longer fills the ring and holds back keys behind it. A hat, the D-pad of many pads, tapped between two polls was lost: the poll's hold-back covered keys, fingers and mouse buttons only. Its four directions are kept back the same way now. android_input_ring_test holds the ring to reading in place, records whole across laps, merging only unpublished moves, and two threads; android_poll_changes_test has a hat lane. --------- Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: LibretroAdmin <[email protected]> |
||
|
|
74b7b06fa5 |
Android second display output for video views (gl and vulkan) (#19905)
* android: drain the sensor queue with both sensors off
Losing focus disables the accelerometer and gyroscope, but an event
already in the sensor queue stays there, and android_input_poll_user()
only read the queue while a sensor was on. The queue's fd stays
readable, so ALooper_pollOnce() keeps returning LOOPER_ID_USER and
android_input_poll() spins at full CPU. The pause and stop
acknowledgements wait for the next runloop iteration, which never
comes: RetroArch logs "App thread did not acknowledge activity state",
the launcher shows late and the app hangs until it gets focus back.
A swipe home hits it often, since focus is lost before onPause.
Always drain the queue and apply the events only while a sensor is on.
* gl2: make a regrown pass texture as the pass's first one
gl2_recreate_fbo() gave the larger texture no filter, so it kept GL's
default GL_NEAREST_MIPMAP_LINEAR with a single level. On GLES that
texture is incomplete, and once a viewport-scaled pass grew, the next
pass sampled black; desktop GL with texture storage gets a complete
one-level texture. Make it with gl2_create_fbo_texture(), as at init, so
it also keeps the pass's filter, wrap mode and float or sRGB format. The
feedback texture is regrown the same way.
* video: per-screen window settings and the screens' window plan
Each screen gets window settings in the config,
video_screenN_window_mode, _x, _y, _width, _height, _monitor and
_fullscreen: Attached, Separate or Hidden, and where a window of its own
goes and how big it is. Screen 1 is always Attached; the others default
to Separate. video_windows_enable, off by default, is the switch that
lets screens leave the main window at all.
video_windows_plan() turns those settings into a frame's plan: the
screens the main window draws, the ones that go to windows of their own
and the hidden ones. A screen stays in the main window while the switch
is off, where the driver has no windows, or once the renderer has sent
it back. The views layout takes exclude_screens, so the main window lays
out only the screens it keeps, and a window only its own.
This is the base the desktop secondary windows and the Android second
display share. The video_windows harness, run in the Linux gfx samples
workflow, checks the plan and a layout with screens left out.
* video: contract for secondary screens' native windows
A context can offer windows of their own for secondary core screens
through an optional gfx_ctx_window_driver_t, the last member of
gfx_ctx_driver_t: create, update, poll and destroy, and bind and
present for GL contexts. Requests, native handles and events carry a
generation from video_driver_window_generation(), a frontend counter
that a driver or context restart does not reset, so an event that
outlives its window cannot be taken for its replacement's.
GFX_CTX_FLAGS_VIDEO_WINDOWS is what a video driver will report once it
draws to such windows; nothing sets it yet.
* egl: window surfaces for secondary screens
egl_window_surface_new/bind/swap/free give a secondary screen's window
a surface on the main context's display and config, with the main
window's attributes. Bind makes the context current on it at swap
interval 0, or on the main surface again; free puts the main surface
back first where the freed one is current. None of them log.
* video: share the secondary windows' event bookkeeping
What a native layer keeps of each secondary window for the frontend -
its owner, record, request, position, the events waiting one bit per
kind, and whether it closed - is a video_window_common_t at the start
of its own state, and the rules on it live once in gfx/video_windows.c:
marking a window closed (CLOSE, with FOCUS_LOSS where it had the focus,
a waiting gain or resume dropped), poll's drain in its fixed order with
whatever has no room left waiting, and the sweep of an owner's windows
at context teardown.
* video: one placement clamp for secondary windows
video_window_place_rect() puts saved bounds on a monitor or its work
area: bounds partly on it are moved onto it, automatic ones and those
not on it at all are centred, and the size is clamped. Whether bounds
are on it is judged as saved, before the size is clamped, so an
oversized window partly on it keeps its position on the other axis.
* video: frame snapshot for secondary windows
A frame presented with views now carries what a driver needs to make,
place and lay out the screens' own windows without reading settings:
each screen's window settings, the window plan, the core's own map and
frame size, the layout parameters and a restore count, from which
video_driver_window_layout() lays out one screen's window. The snapshot
lives in video_driver_state_t and video_frame_info_t points at it, NULL
while windows are off or the driver cannot make them; the threaded
wrapper copies it into the frame's slot, as it does the statistics text.
While the driver can make windows, the main window's layout leaves out
the screens that have one of their own or are hidden.
video_driver_restore_windows() clears the screens a close attached and
counts the request, and window generations can be taken on any thread.
* video: published layouts and translate for secondary windows
A renderer publishes each secondary window's layout as drawn, with the
core map it was made from and the window's client size, through
video_driver_publish_window_layout() from the thread that runs the
context. Latest wins with no lock: each window has three slots handed
over by index exchange, as the window title is, and NULL clears it.
video_driver_translate_window_point() maps a point in a window to the
core's frame: window 0 through the viewport, as before, and a secondary
through its published layout, scaled from client to drawn pixels. A
point in a window that has no layout, was cleared or has another
generation is not mapped.
* input: window-aware pointer and touch publication
input_driver_publish_window_pointers() and _touches() take each device's
and each touch's window: 0 for the main window, else a screen's own with
its generation. A device in a screen's window is placed through that
window's layout for the pointer and the lightgun, and has no place on
the main window's screen; one whose window is gone reads off-screen.
Relative motion, buttons and the ports' devices are as they were.
input_driver_publish_pointers() and _touches() publish into the main
window, so the input drivers that call them need no change.
* samples: video_screens harness for the screens' own windows
The shared windows base is tested against the shipping configuration,
video and input objects: per-screen window settings across saves and
overrides, a screen's own layout, the frame snapshot and its copy
under the threaded wrapper, published layouts and point translation,
window-aware pointers and touches, and window generations. build.py
links the test with a configured non-Qt build's objects; the OpenXR
desktop jobs, which make one, run it.
* video: the window plan can keep a screen other than 0 attached
video_windows_plan() takes the screen that stays in the main window
whatever its mode, and screen 0 takes that screen's mode. Callers pass
0, which plans as before. Android's external monitor rule needs it:
screen 0 goes to the monitor and screen 1 stays on the device, where
the touch screen is.
* video: route the separate screens to a platform's displays
video_windows_route() chooses the display a platform's Separate
screens go to, from a list the platform publishes. A screen's monitor
setting N names the display of ordinal N; 0 is Auto, which takes an
on, valid and physical display that is neither private nor the main
window's: an external one (DIRECT or TRANSITIVE) first, then the
lowest ordinal. On an external monitor Auto puts screen 0 there and
keeps screen 1, so the touch screen stays on the device. One display
takes screens at a time; a screen bound for another stays attached.
Each display also carries its size, for the menu's display picker.
* samples: a touch through a second output's layout
A touch on a second display's surface, mapped through the layout drawn
there, lands in the touched screen's part of the packed frame: one
screen on a 1240x1080 panel, two screens sharing it, and screen 0 on a
monitor; the letterbox reads off-screen when asked.
* samples: pin the attached screen, picker and pillar cases
The plan keeps a screen other than 1 attached with screen 0 in its
mode, and falls back to Attached with no settings. The picker refuses a
private display but takes one that is off, and Auto never takes an
entry without an ordinal. A touch in a pillar beside two screens, not
reported off-screen, is held to the nearer one.
* video: route the screens' windows through a platform's display list
A platform publishes its displays from its UI thread, latest wins,
through three slots as the window layouts are handed over. Each frame
takes the newest list, routes the Separate screens with
video_windows_route() and plans with the screen it keeps attached; a
screen with nowhere to go stays in the main window. All screens bound
for one display share one window, led by the lowest one, and the frame
says which screens each window shows. Taking a list restores the screens
a failed window sent back, and video_driver_attach_windows() lets a
renderer send them back from any thread. A request names its display,
and Android gets a native window kind.
A screenshot or GPU recording through the threaded wrapper draws the
cached frame again on the video thread. That redraw takes no list: it
keeps the app thread's last route, as it reads the forced and restore
state, so a renderer keeps the second display's window and the capture
shows the right screens. The route is written only when it changes, so
Win32, which routes nothing and whose modal redraw runs beside the app
thread, never writes it while it is read.
The video_screens harness redraws the cached frame through the real
threaded wrapper and checks that it keeps the frame's route and plan.
* video: let a platform take the secondary windows back
video_driver_windows_retire() has the renderer let go of every
secondary window, through a new optional poke hook. It is for a
platform command such as Android's second surface going away, never a
frame. With the threaded wrapper up it is queued to the video thread
behind the frame being drawn, and nothing waits for it: a hook the
caller passes runs there just before and just after, for the platform
to hold its own requests back and to hear when it is done. Without the
wrapper all of it runs before the call returns. One is queued at a
time; false says the video thread cannot take it yet.
video_screens checks that a retire queued behind a frame being drawn
returns at once, and runs after the frame, between the hook's calls.
* video: one slot hand-over for the window layouts and displays
The window layouts and the display list are handed over the same way,
through three slots. Two small helpers publish and take a slot for both,
with the same memory orders. No behaviour change.
The harness adds two display list checks: a longer list keeps its first
VIDEO_WINDOW_DISPLAYS_MAX, and a get of capacity 1 fills only the first
entry.
* android: native side of the second display
The Java controller hands native code the display list and the second
display's surface through three natives. The list goes to
video_driver_publish_window_displays(). A surface becomes a node holding
one ANativeWindow reference, exchanged in for the video thread to take,
with a generation the touches carry. A size change of the same window
keeps the generation; a different window first gives up the old one.
Giving one up uses the main window's ticket handoff: the UI thread waits
while the app thread drops the node and queues the renderer's letting go
of its windows. The thread that lets go of them acknowledges once it is
done, so the UI thread is not left waiting for the app thread's next
poll; a retire the video thread cannot take yet is tried again from the
input poll. Native code asks Java to show or hide the display through
setSecondDisplay(), which posts and never waits, and asks nothing while
the renderer is letting go of a surface. The app state gets a 64-record
ring for the display's touches.
The natives run on the UI thread and read its own app state,
g_android_early, which android_app_free() clears unless a re-created
activity has already replaced it, so a callback after onDestroy finds
none. A display name GetStringUTFChars cannot read leaves no exception
pending for the next JNI call.
* android: second display windows for the gl and vulkan contexts
Both Android contexts give the renderer the secondary-window table.
Creating a window asks Java to show the display it is routed to and
returns unconfigured. Until Java publishes its first display list a
Separate screen resolves to display 0, which names no display, so its
window is refused and the renderer keeps the screen attached until a
list arrives. An update takes only the request's settings; another
screen or request generation is a new window, the renderer's to make.
Its poll hands it the newest surface native code received, raising
GEOMETRY and publishing which window and surface the input poll maps
touches through. The EGL context makes the window's surface on the main
context the first time it is bound after a surface arrives, at swap
interval 0, with the native visual id queried once at init, since the
query logs on failure and binding sits on the present path; the Vulkan
context gives the renderer the ANativeWindow and leaves the surface to
it.
Each request native code sends Java carries a number, and each surface
comes back with the number of the request it was made for. Destroying
the window drops the surface it held, then asks Java to hide the
display. When it was the last window, that hide gives up every surface
made for an earlier request, including one that reaches native code
after it: no window takes one, and its surfaceDestroyed frees what is
left and returns without the ticket handoff. A hide native code starts,
for closing or switching content or reinitialising the video driver,
never holds the UI thread.
* android: touches on the second display reach the core
Each touch on the second display crosses from the UI thread in the ring
with the generation of the surface it was on. nativeTouch sits with the
other second display natives and reads the UI thread's own app state,
which android_app_free() clears. A down or a move goes in only when it
leaves room for an up of every finger the input driver tracks, and an up
only when its down went in, so a full ring never drops a lift and leaves
a finger pressed for the core. MAX_TOUCH moves to platform_unix.h for
the native and the input driver to share.
The input poll drops the touches of any surface but the one the renderer
shows, maps the rest through that window's published layout into the
core's frame, and keeps the fingers after the main display's in the
core's pointer list. They never move the mouse, count as a quick tap or
reach the frontend's own screen pointer, so the menu and overlay stay on
the main display.
* input: the second display's fingers on a device of their own
With an overlay's pointer on, or one of its buttons held, the frontend
answers RETRO_DEVICE_POINTER from the overlay or not at all, and a
windowed overlay polls that device as its own touches. So the second
display's fingers cannot share it: the Android driver answers them on a
frontend-only RARCH_DEVICE_POINTER_SECOND and keeps RETRO_DEVICE_POINTER
to the main display. The frontend lists them for the core after the main
list's pointers, whoever answers for those: the overlay, none while the
pointer is blocked, or the driver. A driver with no second list answers
with its main list alone.
The pointer_second harness checks those answers against a stand-in
driver with both lists, through input_state_device() and the overlay's
pointer answer extracted from input_driver.c.
* android: a Presentation for the second display
SecondDisplayController lists the displays for native code - whether
each is the Activity's own, valid, on, private, a real panel or monitor
(product info, API 31+), its connection, name and size - and shows a
Presentation with a SurfaceView on the display native code asks for. The
window is not focusable and not touch modal and the view is not
focusable, so touching it neither pauses the core nor takes the gamepad;
it keeps the screen on and, on API 29+, keeps system gestures off it. It
follows the Activity from onStart to onStop, holding a request made
while stopped, and a frame after a display or configuration change
publishes the list again when it changed. A display it cannot show on
stays invalid until the list changes, so the display events a
Presentation coming or going may fire do not retry the failing show in a
loop. Each Presentation carries the number of the show request it was
made for and hands its surfaces to native code with it; touches go with
the surface's generation.
* android: second display failures and Presentations Android dismisses
Every display a show failed on stays invalid until the list changes or
the Activity starts again. A single failed id would not do: of two
displays that both refuse a Presentation, marking one failed makes the
other valid again, native code routes back to it, and the two take turns
failing forever. Starting again retries a one-off failure when the app
returns.
Android cancels a Presentation itself when its display's metrics change
(API 17-29). A dismiss we did not make clears it, so the dead
Presentation does not leave its display counted as shown. While native
code still wants that display, it is shown on again if the dismissed
Presentation's view had a surface. One cancelled before that cancels
itself, for example on stale display metrics, and rebuilding it would
loop at message rate; it counts as a failed show, so its display is
published invalid until the list changes or the Activity starts again.
* video: which screen windows a renderer makes and lets go each frame
video_windows_steps() tells a renderer, from one frame's snapshot,
which of its windows to let go of (no screens now, or another
display) and which to make. A window that closed or failed is not
made again until the restore count moves, so frames already queued
do not bring it straight back. Renderers share the rule instead of
each keeping its own.
* gl2: views draw into a given output; the preset's targets can grow
gl2_views_render() takes the layout, size and canvas it draws with
instead of reading the main window's, and the loop that grows the
preset's targets on a resize becomes a function of its own. Nothing
changes for the main window; a screen's own window will draw through
both.
* gl2: draw the screens' own windows
With a context that can make windows of their own for screens, gl2
reports GFX_CTX_FLAGS_VIDEO_WINDOWS while it may draw views. Each frame
it makes and lets go of the windows the frame's snapshot asks for and
draws each one's screens through the views compositor, with the preset's
passes where one is loaded. A window's pass targets grow only once its
surface is bound, so a failed bind has nothing to undo. A window is
drawn after the main window's frame and swapped at interval 0 before the
main swap, which stays the only one that can wait. The menu, OSD,
widgets and overlay stay in the main window.
A window that cannot be made or drawn hands its screens back to the main
window until the next restore and logs once. A window its context closes
hands them back too, and a restore that lands in the same frame does not
make it again; one closed with no screens left is not marked failed, so
it can be made again when its screens come back before the next restore.
The poke's windows_retire lets go of every window at once, for a
platform that takes a surface back.
The gl2_pbo_readback and gl_last_pass_fbo samples include gl2.c; neither
draws windows, so their shared stubs answer the frontend's window calls
with no-ops.
* samples: views test core logs a second finger, and asks for GLES 3
With a finger on each of two displays the second display's finger is
pointer 1. The core reads, maps and logs pointers 0 and 1 through one
helper, each with its own last state; pointer 0's lines and crosshair
are unchanged. Android's gl driver only gives GLES contexts, so a gles3
value of video_views_test_hw lets the core render through hardware there
too. gles3 with the checker or noise pattern logs an error at load:
those patterns upload a BGRA texture, which GLES 3.0 does not take.
* vulkan: the window-system surface switch as a helper
vulkan_surface_create() made the VkSurfaceKHR for each window system
in line. The switch moves into vulkan_wsi_surface_create(), which
takes the instance and returns the surface, so a second output on the
same device can make its own surface the same way. VULKAN_WSI_DISPLAY
stays where it was, since it needs the context's GPU. No behaviour
change.
* vulkan: a second output on the context's device
A vulkan_output_t is a surface of its own with a swapchain on the
context's device and queue, for a screen shown on another display. It
never waits in a frame. The acquire takes no time and uses a fence,
never a semaphore, so nothing the second display's presentation engine
signals ever enters the queue the main output's frames share. The fence
is polled, and an image not yet free is kept for the next frame. Out of
date remakes the swapchain at once; suboptimal remakes it once and then
keeps it, as the main chain does. On Android the swapchain takes the
size the window reports, since the surface's currentExtent can lag an
in-place resize and Android scales any extent to the window. A lost
surface is dropped. A swapchain let go of is destroyed once a fence
queued behind its last present has signalled. Only teardown waits, on
the output's own fences.
The harness runs the real code against a fake device and checks that no
frame-path call waits, that only completed objects are destroyed, and
that everything made is freed.
* vulkan: draw screens in windows of their own
Where the context has a windows table (Android's second display), a
screen the plan sends to a window of its own is drawn there with its
views' chains, sized for the window, and the frame's own view copies.
The window is drawn in the frame's command buffer, after the main pass
and before the chains end their frame. Its image comes from a fence
already signalled, so the frame's submission waits on nothing new; it
signals the window's semaphore, and the window presents after the
submission and before the main present, which stays the only one that
waits. The menu, OSD, widgets and overlay stay in the main window.
A window that can't be made, drawn or kept puts its screens back in
the main window until the next restore. One whose output is not done
yet is let go of on a later frame; the poke's windows_retire and the
driver's teardown wait for it, on the output's own fences.
* video: separate screen windows on by default on Android
On Android a Separate screen goes to a second display, which is what a
device with two panels is for, so the switch starts on there. Desktop
windows stay opt-in. The settings table records the Android default;
the harness checks that an override carries the switch and a screen's
mode.
* menu: a window mode and a display for each screen from 2 on
Each screen past the first gets two settings rows: Attached, Separate or
Hidden, and the display it goes to when it is Separate. The display
picker offers Auto and the displays the platform has published, shown as
the monitor index is ("2 (Screen-2 1240x1080)"), and keeps a display set
elsewhere until it is changed. It widens only up to the most displays
that can be published, so a hand-edited value in the thousands cannot
build a list that long on the main thread. The row's sublabel says that
the display RetroArch is on keeps the screen attached. Each screen's
rows have their own enum, as the per-port input rows do, so the dropdown
and the sublabel find the right one. A change to any of the rows gives a
screen the renderer sent back to the main window another try.
The settings harness checks the rows, the left key's clamp, and that a
change to any of them restores closed windows.
* menu: show the screens' window rows where the driver has windows
Stereo 3D & Screens shows Separate Screen Windows when the video
driver reports secondary windows. While it is on, it also shows the
mode and display of screen 2 and of each further screen the core has.
On Android the switch reads "Show secondary screens on another
display". A screen row's dropdown takes that row's label as its
title.
* android: show the second display again after its metrics change
On Android 10, a density or size change on the second display left it
empty until the app restarted. Android cancels a Presentation when its
display's metrics change, and the one made to replace it got the
display's resources from a cache keyed by display id, still holding the
old metrics. Presentation.onStart() found them stale and cancelled it
before it drew, so the display was marked failed and both screens stayed
on the main display.
Bring the new Presentation's resources up to the display's current
metrics before showing it. The refresh runs only before Android 12; from
then on a Presentation has a window context of its own.
* android: read input queue keys and sticks through their fields
The key and stick helpers of the input queue take the few fields
they read instead of the event, and the default loop's slot lookup
and key path become functions of their own. Nothing changes for the
queue; the second display's window can then hand its keys and stick
moves to the same code.
* android: a focus rule for the Activity and the second display's window
Once the second display's window can take focus, RetroArch's focus
comes from two windows. Where each display has its own focus, the
second window keeps its display's focus while the keys go elsewhere,
so it counts only while in use: after a key, stick move or touch from
it, a focus it gained while the Activity had none, or a hand-off of
the one focus from the Activity. Any other change of the Activity's
focus ends that, so a notification shade still pauses as before.
The rule is a header without NDK types; a host test replays the
sequences the AYN Thor's focus modes and a one-focus system produce.
* android: keys and sticks from the second display's window
Keys and joystick moves the second display's window receives cross
from the UI thread in a ring of their fields; the input poll handles
them with the input queue's own code, so mapping, device ids, axes,
hats and hotplug behave the same. The window's focus comes in as two
commands, and the focus of both windows is acted on once per poll by
the focus rule, only when it changes.
A paused app thread sleeps in its looper, so writing to either of the
second display's rings wakes it, and the poll reads both rings after
the looper so the woken poll acts on what woke it. The app thread
keeps a reference on its looper for those wakes until the activity is
freed.
* android: the second display's window takes focus and passes keys on
The second display's Presentation can take focus, so a tap on it or a
focus mode that locks the gamepad to its display (the AYN Thor's Bottom)
gives it the pad. Its keys and joystick moves go to native input as the
Activity's do. Each key gets native code's answer, so Android makes no
fallback key (BUTTON_B as BACK, BUTTON_MODE as HOME) of a key RetroArch
uses. It is not cancelable, so BACK stays with native code, and it never
becomes the soft keyboard's target. The IME refuses the Activity's text
field while the second display's window holds the focus, so the Activity
asks for the soft keyboard again when it regains focus.
When RetroArch dismisses the Presentation while it holds the focus, it
first brings its own task to the front, which takes REORDER_TASKS
(granted at install). Android keeps one focus for all displays, so it
would otherwise pass to that display's launcher and leave RetroArch
without focus until the next tap on the main display.
* android: hand the second display's surface back without waiting
surfaceDestroyed and a window change on the second display return at
once. The renderer's own ANativeWindow references keep the window
alive; a frame still drawing into it gets an error from the abandoned
queue, and the next frame's poll finds the surface gone, drops it and
lets the EGL surface or Vulkan output go, the output on later frames
while the presentation engine still holds an image. Nothing waits on
the video thread or the GPU, so the UI thread can't stall into an ANR
behind a slow frame, and the window keeps its display for the next
surface. The going surface also gives the windows another try, so a
failure it caused is not held against the next.
vulkan_output_finish() is the driver's teardown only. An acquire it
gave up on keeps its fence, which is never destroyed while it may still
be signalled.
* video: build the screens' own windows only where a platform has them
HAVE_VIDEO_WINDOWS gates the secondary windows: their state in the
video driver and the threaded wrapper's slots, the drivers' window code
and its per-frame calls, the second output and EGL window surfaces,
the input layer's second pointer list and window places, and the
per-screen settings with their menu rows and config keys. Android
defines it; elsewhere ./configure --enable-video_windows does, and the
CI job that runs video_screens_test builds that way. A build without it
compiles none of this and carries none of its state, which is about
15 KB of the video driver's state alone.
* video: a window failure counts only for the restore it was drawn under
A renderer reports a window it could not make or keep with the restore
count of the frame it was drawing. Failures travel in one word, the
screens beside that count, and the main thread takes them only when
the count is still its own. Under threaded video a frame laid out
before a display or surface change can fail after that change; its
failure no longer keeps the screen on the main display until some
later event.
* android: the jelly-bean package may reorder tasks too
It builds the same second display controller, which brings RetroArch's
task back to the front when it dismisses the second display's window on
a one-focus system; without REORDER_TASKS that call throws and the focus
stays on that display's launcher.
---------
Co-authored-by: libretroadmin <[email protected]>
|
||
|
|
46c424a313 |
android: the press grouping reads the clock only when a pad was pressed
How new a press is, is all the clock was wanted for, and it was read at every poll while the input block timeout was on. It is read now only on a poll a pad's button was pressed in; presses held over are shown, and a tap let go, without it, and a pad with nothing held is not looked at. |
||
|
|
628ea4dcf7 |
android: the input block timeout keeps presses back instead of waiting
The poll waited up to the input block timeout for an event, and again after each one, so that a press a pad sends as several events a few milliseconds apart landed in one poll. That stalled every frame by the timeout, pressed or not, on the main thread. The poll no longer waits in the foreground. Instead a pad's presses in a poll are shown at its end unless the newest of them came within the timeout of it, by Android's own event times: then they wait for the next poll, and the rest of the press, coming before that, is shown with them. Nothing waits more than one poll, an older press is shown at once, and a press let go before it was shown is shown for one poll. At 0, the default, nothing is kept back and it costs nothing. The keeping back is android_press_group.h, which samples/input/android_block_timeout holds to all of that. |
||
|
|
0e2cc5da04 |
android: the input block timeout is waited after each event again
Input Block Timeout lets a pad that sends one press as several events have them all taken in the same poll: the poll waits up to the timeout for an event, and again after each one, until none follows within it. The change that stopped the poll draining the battery in the background waited only for the first event and none after, so the setting did nothing any more. In the foreground the timeout is waited after each event again; backgrounded the poll still waits for whatever wakes it and then drains the queue without waiting. The waits are in android_poll_wait.h, and samples/input/android_block_timeout holds them to both, with the first-event-only way asserted to be caught. |
||
|
|
74d02ceaaa |
menu: preserve and select existing text when editing (#19809)
* menu: add an option to preserve text when editing Prefill string settings and playlist names before opening built-in or native keyboards. Expose the behavior in Menu Controls, enabled by default, with a persisted menu_input_preserve_text setting. * menu: distinguish new text input from editing Use an explicit dialog type to preserve existing values when editing. New-entry, search and authentication dialogs start empty. Remove the menu option and configuration setting. * input: select existing text when opening an editor Typing replaces the initial selection, while arrow keys collapse it for editing. Draw the selection in each menu driver and select the initial text in native Android and iOS fields. * text entry: no stored passwords on screen, and native buffers stay put A password setting opens its editor empty rather than with the stored secret selected in plain text. The Android and iOS keyboards put a fixed 512-byte buffer under the line. Opening it now sets the line's capacity to that buffer and marks it fixed, so an append from a hardware or on-screen key stops at its end instead of writing past it or moving it from under the keyboard. frontend_overhead's text selection lane opens a string setting and a password setting, types over a selection, and appends to a fixed line. --------- Co-authored-by: LibretroAdmin <[email protected]> |
||
|
|
5103a232df |
OpenXR: one core for the desktop and Quest headsets, with head tracking, controllers, settings and desktop OpenGL (#19811)
* menu: the cursor stays on Headset Output when Stereo Mode comes and goes Stereo 3D & Screens lists Stereo Mode above Headset Output only while the headset is off. Turning it on moved Headset Output up a row and left the cursor on the row below it, Headset Refresh Rate, so a second OK meant to turn the headset off opened the rate list instead. The cursor follows the row, as it does for Mapped Port when Device Type comes and goes. samples/menu/stereo_headset checks it for OK, right and Start. Co-authored-by: Craig <[email protected]> * openxr: a session without focus is not logged as controllers not read xrSyncActions answers XR_SESSION_NOT_FOCUSED, a success code, while the runtime's dashboard or another application has focus. It was logged as a warning each time focus went; only a failure is now. The test layer answers a sync with a scripted result (sync <n>), and the headset suite gains input-sync-unfocused. Co-authored-by: Craig <[email protected]> * libretro: a TRACKED view map, and HMD is how a core finds a headset A map's shape could not tell a head-tracked eye pair from a stereoscopic screen sent alone. The new flag says which. HMD now means tracking works, and a core learns of a headset from it only. REQUEST_FLAT is a map without the flag, and OpenXR always gives real eye poses, so the flag and the IPD hint go; nothing read either. Co-authored-by: Craig <[email protected]> * openxr: the runtime, session, swapchains and frame loop are shared units The desktop Vulkan host's instance and headset, its session state machine, its swapchain slots and its frame loop with pacing move into gfx/common/openxr_*, which name no graphics API, so every headset host can use them. vulkan_openxr keeps only what is Vulkan's. Co-authored-by: Craig <[email protected]> * video: the headset's host says how it is, and answers the pose calls One host interface reports the headset's state on the desktop and the Quest alike. HMD comes with PRESENTS and STEREO, and only while the session runs. The pose calls go to the host, and a view map sent again unchanged is not applied again. Co-authored-by: Craig <[email protected]> * openxr: a TRACKED map's eyes are the desktop headset's projection Tracked content gets a space of its own, LOCAL or STAGE as the core asks, and the poses sampled in it. The eyes the core draws are submitted as a projection layer with the poses it was given, and the screens a headset leaves to that projection are hidden. A recenter moves a seated world with the screens; a standing one stays where the room puts it, and the core is told RECENTERED. A paused core's tracked world comes back after a driver reinit. The views test core can draw a world-locked grid, for checks made in a headset. Co-authored-by: Craig <[email protected]> * vulkan: the Quest's headset runs on the shared OpenXR core The runtime starts Android's loader and tells the instance of it. A headset frame can be begun and ended inside the video frame, so vulkan_openxr runs in-line for a headset's own context, which says so in its flags. The units that name no graphics API build without Vulkan, and a GLES binding is ready for the GL host. A space a core asks for again is kept, so a cached context keeps its paused world. Co-authored-by: Craig <[email protected]> * gl: the Quest's headset runs on the shared OpenXR core The Quest's ES3 context is its own in-line host: gl2 draws into a window the context owns, shown as a screen in the room, and copies a tracked map's eyes into the headset's projection. The window shows until the first projection. The kept view pair lives in openxr_host, so the GL host keeps a paused world across a reinit as Vulkan does. The quest flavour builds with GLES=3. A stand-in runtime test runs the in-line host. Co-authored-by: Craig <[email protected]> * input: one headset controller module for the desktop and the Quest The headset input's hooks belong to the frame, so any host attaches the module, and the Quest's own controller module goes. Touch's menu button is Start from its press, and opens the RetroArch menu when let go after a second. The menu's laser can point at a window shown whole, mapped through the area the core is drawn in. The stand-in test runs the shared module. Co-authored-by: Craig <[email protected]> * video: headset settings for every headset driver, and Screen Placement The headset's rows show for every driver with a headset path. Recenter works in the menu and reaches the Quest's GL host, and a seated recenter moves a paused world with the screens in the same headset frame. Screens are placed from an anchor of their own: Fixed in Room, Follow Head or Lazy Follow. The Quest asks for a refresh rate that fits the content and repeats each core frame for whole headset frames. Co-authored-by: Craig <[email protected]> * input: the headset's controllers are a controller They take joypad slots with built-in profiles, so hotkeys, port binds, remaps and rumble use the normal input path on the desktop and the Quest. They take the next free slot like any pad, and keep their port when a gamepad is plugged in, without saving that exchange. A saved "Meta Quest Touch Plus Controller" profile and its remaps no longer apply. Co-authored-by: Craig <[email protected]> * gl: headset output for the desktop OpenGL drivers glcore and gl show a headset on Linux. The XR thread holds a context in the window's share group, made by the X11, X11 EGL and Wayland context drivers, and the session binds it through XR_KHR_opengl_enable or XR_MNDX_egl_enable. The video thread draws each image into shared textures and hands it over with a fence through a triple buffer; the XR thread copies the newest into the swapchain and shows it with the quads or the eye poses it was drawn with. glcore draws the screens and the menu through chains of its own and a tracked map's eyes as the projection, as Vulkan does. gl shows its window, whole or cut into an untracked map's screens, as the Quest does, and tracked eyes as the projection. Both follow the headset's pacing: the XR thread wakes the core for its next frame after taking the last, so none is shown a headset frame early. OpenXR configures with OpenGL alone, without Vulkan. The test layer captures OpenGL swapchain images, and the headset end-to-end runner has lanes for both drivers on GLX and EGL. Co-authored-by: Craig <[email protected]> * docs: OpenXR headset output, and how a headset or graphics API is added What the headset path does and how to build and turn it on, what a core sees, which units are shared and what each of the three hosts adds, and the steps for another headset, graphics API or platform. Co-authored-by: Craig <[email protected]> * audio: pass the reinit flag to MMDevice watchers XAudio2 and DirectSound must give mmdevice_thread the frontend atomic flag. Passing the driver object overwrites its watcher handle when an endpoint changes. Exercise both thread backends against the extracted production spawn functions. * test: reject video backend fallback in the threaded harness Fail early when HARNESS_VIDEO_DRIVER differs from the initialized backend so a missing driver cannot qualify another backend's lanes. * Animated previews: keep high-bitrate audio fed across loops Size the audio lookahead from the preview bitrate, prime it before playback, and refill the full window on rewind. The audio demuxer walks interleaved video packets too; a fixed 2 MiB window stalled on large H.264 packets and left high-bitrate previews silent or delayed after looping. Add a real feeder/mixer regression using generated oversized video packets. Verify that audio continues through three complete loops; the previous feeder fails this test. Validate both reported 4K clips locally on Windows and Linux. * wdmks: bound threaded writes by the device fragment A small write can exhaust its request-sized wait budget before a healthy WaveRT pin's next notification. Size the threaded ring waits from rt_ahead instead, and cover writable waits and blocking writes against a 64 ms fragment. * CI: views end to end on glcore and Vulkan under Xvfb run.py gains RA_E2E_XVFB (Xvfb in place of gamescope, llvmpipe and lavapipe) and RA_E2E_ONLY (a case filter). The validation job runs a subset of the cases. * Views: one compositor for gl3 and Vulkan gfx/video_views_draw.h holds the chain pick, the placement loop with the interlaced row shift, and the canvas and UI target lifetime. Each driver includes it with its own calls bound in by macros, so nothing goes through a function pointer. The UI layer's predicate, per-eye test and dims swap move to video_views.h. Output is unchanged. * Threaded video harness: the frame on screen is the core's newest A frame lag lane checks, end to end, that what the driver draws is the frame the core pushed last: the harness core stamps each frame with its number in eight full-height bands that survive scaling and filtering, and the lane reads back the driver's own upload (the cached frame dropped first) and decodes it. Copied, lent and lent as a cropped window, with threaded video off and on: with nothing in flight it must be the newest pushed frame, and with frames still in the wrapper's ring at most one behind. A zero-copy path that draws a buffer the core has since rewritten, or skips an upload, or a wrapper that holds frames back, fails it. It runs on vulkan, gl and glcore, desktop and GLES 3, in the existing harness jobs (release, ASan+UBSan, TSan, the validation layer). * Fix MSVC preprocessing of video views UI checks Move widget conditionals outside VIDEO_VIEWS_UI_WANTED calls in the GL3 and Vulkan drivers. The traditional MSVC preprocessor treats directives inside macro arguments as tokens, breaking the Windows build. * Provide audio state in the DirectSound pump harness The device notification thread now uses the audio state reinit request. Supply a persistent harness-owned state through audio_state_get_ptr so the standalone MinGW test links. * Preserve RetroArch when building the threaded video harness Request the link command with make -W instead of deleting the frontend executables. The later video views end-to-end tests need the existing RetroArch binary to launch. * ATRAC3plus: accept implicit master code-table indices Master channel code-table mode 3 has no payload and uses zero indices. Return before consuming the optional value count bit, rather than rejecting valid frames and losing bit alignment. Add a synthetic regression covering float, s16 and reset decoding. * Expose hardware H.264 decoding with CPU planes to cores Provide an experimental versioned frontend decoder interface with Vulkan and D3D11 I420 readback. Reserve private video queues through Vulkan device negotiation v2, and retain the decoder backend with cached devices across video driver reinitialization. Keep software fallback for unavailable or disabled hardware decoding and cover readback in decoder and GPU tests. * ATRAC3plus: distinguish coded and declared subband flags Use coded subbands for stereo swap and negation flags and declared subbands for window shapes. Add a synthetic audible stereo regression to detect parser misalignment when fewer subbands carry spectra. * D3D11: views The driver draws a core's views through video_views_draw.h, straight from the frame as the stock chain draws it: placed in each eye's area, blended through a canvas for anaglyph and interlaced, with the UI drawn once into a layer composited into each eye. With a preset or HDR output the frame is drawn whole. Windows-wine-views.yml runs the views end to end on it: run.py gains RA_E2E_WINE, for retroarch.exe under Wine with vkd3d's shader compiler, and the test core builds as a DLL. * D3D12: stock pipes made for the swap chain's format The pipes were made before the swap chain, whose formats were still unset, so every stock draw had an UNKNOWN target format: Windows drivers draw it anyway, vkd3d (Wine) draws nothing. They are made after it now. * D3D12: views The driver draws a core's views through video_views_draw.h as the D3D11 driver does: straight from the frame, through a canvas for anaglyph and interlaced, with the UI drawn once into a layer composited into each eye. Its SDR pipes keep coverage in alpha, which the layer is composited by. With a preset or HDR output the frame is drawn whole. Windows-wine-views.yml runs the views end to end on it as well, on Wine's vkd3d over lavapipe. * openxr: apply unified headset support to current master Apply PR #19811 at |
||
|
|
65c6a192b2 |
android: normalize Center in keyboard callbacks
HDMI-CEC and keyboard-classified IR remotes send DPAD_CENTER for OK. Normalize it to ENTER for both callback key translation and character lookup, sharing the rule used by the held keyboard state. Raw joypad keycode 23 and source routing remain unchanged. Extend the C89 keyboard-state and CEC routing fixtures to cover normalization and press/release parity. Fixes #19249 |
||
|
|
87cfa110a1 |
input: an input driver's state call is not told the keyboard is held
Every input driver's state call took a flag, keyboard_mapping_blocked: whether the keys are kept from the binds. It mattered when drivers answered the binds themselves. The frontend answers them now, from the keys it asks a driver for once a poll, and applies the flag itself; a driver's state call answers the keyboard, the mouse and the pointer, and none of the twenty-three read the flag. (udev passed it to its touch code, which did not read it either.) The parameter goes: from the interface, the twenty-three drivers, the frontend's own stand-in driver and its nine calls. The frontend's own functions keep theirs - that is where it is used. Measured against this same master built without it, the frame's input work over 300 frames (X11): 3,690,770 instructions to 3,690,476 with no controller, 4,354,940 to 4,354,646 with one. An argument a call. Checked: the frontend harness passes every lane; the X11 keyboard session logs the same as before, and the hotkey and quit-combination sessions what master's binary logged; the raw input keyboards test and the plain Win32 input test, which call a driver's state function themselves, pass under Wine. Built: Linux in full; DirectInput, raw input and the plain Win32 driver with a mingw compiler; the Android unity build with the NDK; Wayland; the Visual C++ 6 project and the QNX driver on their stand-ins; a build with the optional features off. Not compiled, there being no compiler for them here: Cocoa, UWP, the web driver, SDL 1 and the console drivers (DOS, Wii, PS3, PS4, PSP and Vita, Switch, Wii U); theirs is the same one line, taken out by script. The second of three pieces before steps 3 and 4 of the mapping compiler (plan, section 21). The joypad, its info and the binds are handed to the same call, and two drivers use any of it: the Wii's reads one field of the info, the Wii U's asks the joypad for its touch screen. With those two reworked the call would take the port and what is asked, and nothing else. |
||
|
|
b076226b6e |
android: ask the XR context by name instead of taking video state
The input/video separation gate holds input/ to zero video_state_get_ptr() calls, and the INIT_WINDOW handler had the one: reaching into the video state to string-compare the current context ident against android_vk_openxr before deciding whether a new window requests a reinit. The question belongs to the context driver, so it now answers it by name: android_vk_openxr_active() is true exactly while that context is current - its XR instance lives from init to destroy - and the handler keeps the same behaviour, suppressing the reinit only while the XR context holds its session across window recreation. Both separation checks pass again, with the grab check's counts unchanged. |
||
|
|
ebfc5c7652 |
VR support - Quest to begin with (#19726)
* deps: add openxr-sdk * openxr: initial implementation * openxr: build the vendored loader from the tree, drop the CMake step The OpenXR loader is compiled like every other vendored dependency instead of through a cmake invocation run from a $(shell) at Android.mk parse time against one hardcoded NDK path: griffin_cpp pulls in the loader, jsoncpp and (on Android) the jnipp/android-jni-wrappers broker sources, griffin.c picks up the generated C dispatch table, and the loader links statically into retroarch-activity, so the prebuilt libopenxr_loader.so module and its packaging disappear. The loader is C++17, so the quest build appends -std=gnu++17 after the global gnu++11. Makefile.common gains an equivalent HAVE_OPENXR block (platform-neutral sources only) and qb grows a disabled-by-default HAVE_OPENXR switch, so a future desktop OpenXR backend builds the same loader through configure rather than growing a second build path. * openxr: move the vendored loader onto libretro-common threading The loader's C++11 threading (std::mutex, std::shared_timed_mutex, and jnipp's std::atomic_bool) is replaced with rthreads slocks and retro_atomic. Cold paths - the global loader lock, the property overrides, the debug-messenger map - keep plain mutual exclusion as lazily-created slocks published with a CAS. The two read-mostly structures become lock-free: the runtime dispatch table is a single acquire/release-published slot, since the loader only ever has one live runtime instance, and the logger's recorder list is an immutable snapshot that the LogMessage paths walk wait-free while writers rebuild and republish it under a cold slock, retiring superseded snapshots and removed recorders until teardown so a reader never touches freed memory. One behavioural delta, noted in loader_logger.hpp: a removal no longer waits for in-flight readers, so a log call racing it can reach the removed recorder once more before it drops out of view. The per-frame xr* dispatch (the generated trampolines through the cached dispatch table) was already lock-free and is unchanged; this puts the whole tree on one threading layer and drops the libstdc++ thread machinery from the loader. Verified with per-TU and griffin-shape amalgamated C++17 builds of every touched TU, plus a TSan and ASan/UBSan/LeakSan harness driving concurrent LogMessage readers against recorder add/remove churn and concurrent first-use slock creation. * openxr: route Vulkan instance/device creation by context, not build On a HAVE_OPENXR build every VkInstance and VkDevice went through xrCreateVulkanInstanceKHR/xrCreateVulkanDeviceKHR unconditionally, so the flat vk_android fallback the driver takes when a session is unavailable could never create a working context, and the queue-family probe still queried surface support with a null surface after computing the headless answer. Creation now routes through OpenXR only when the live context is android_vk_openxr - everything else keeps vkCreateInstance/vkCreateDevice - and vulkan_common reaches the XR instance and system id through accessors on the context driver instead of another TU's static, which only linked because of griffin include order. The headless surface check is a single call that never passes VK_NULL_HANDLE. In vulkan.c the swap-interval emulation and BFI frame-duping recursion are skipped under an XR session: the compositor owns pacing, and re-entering vulkan_frame would issue a second xrBeginFrame before xrEndFrame (the context's begin_frame also guards against re-entry now). The HW fence wait keeps one shared condition with XR added inside a single #ifdef so the non-XR build preprocesses exactly as before, the dangling HAVE_OPENXR_2D probe is gone, and the eye loop and vulkan_frame_eye declarations are C89. * openxr: fix quest input regressions, make shared state cross-thread safe android_joypad_state's axis-to-button path required port 0 under HAVE_OPENXR, so physical pads on ports 1+ lost all analog input on the quest build; it now goes through android_joypad_axis, which merges the XR sticks for port 0 and falls through to the plain Android state for every other port. Window motion events are only suppressed while an OpenXR session is actually live instead of being compiled out (the unreachable duplicate source check is gone), the never-defined HAVE_XR gates are removed so the file matches the behaviour the quest build has actually been tested with, and the INIT_WINDOW reinit check is braced with its declaration at block top for the C89 lanes. The shared OpenXR input state (buttons, axes, attach flag, menu long press) is written by openxr_input_sync on the frame loop's thread - the video thread under threaded video - and read by the input drivers on the main thread, so it moves onto retro_atomic with a swap-consumed long-press flag. The shared readers also lose their android_vk_ prefix (they serve the GL path too) and live in openxr_input.h; the long-press hotkey check in input_driver.c gains the ANDROID guard its definition has always had. * openxr: report VR availability honestly, decouple GL path from Vulkan gl2's set_vr_content_info returned true unconditionally, so a core asking for VR on the flat fallback context was told a session existed and got a 0x0 recommended eye size; it now reports unavailable unless the OpenXR context owns a live session, video_driver refuses and unwinds a request when no eye target size is available, and the Vulkan driver treats a NULL info as the documented disable instead of a probe, clearing its stereo state. The unused RUNLOOP_FLAG_CORE_VR_CONTENT is dropped: it sat on the deliberately retired bit 31 (1 << 31 in a signed enum besides), and the bool the code actually uses stays, with its comment naming the real environment calls. griffin no longer nests the GL OpenXR context, the shared OpenXR input TU and the loader dispatch table under HAVE_VULKAN, so a GLES-only HAVE_OPENXR build links instead of failing on prototypes. The GL context's end_frame declarations move to block top for the C89 lanes, the stray C++ comment is gone, and the magenta debug clear on the eye buffer is black. * android: keep quest manifest entries out of the shared manifest The Oculus app id meta-data and the installLocation flip to auto landed in the manifest every Android build ships. The app id moves to the quest flavor's overlay manifest where it belongs, and installLocation returns to internalOnly, which is set deliberately: external-storage installs have broken content paths and services before. If the quest build needs auto, it can set it in its own overlay. * deps/openxr: trim the vendored SDK to what the tree builds The full SDK checkout came with its own CI configs, CMake build system, gradle/prefab/vcxproj packaging, jsoncpp's test suites, examples, docs and devtools, jnipp's project files, and the unused non-core dispatch table. All of it goes: what stays is the OpenXR headers, the loader and common sources the tree compiles, the lib_json sources and headers, jnipp and the android-jni-wrappers, the generated core dispatch table, and every license file (LICENSE, COPYING.adoc, the LICENSES directory and REUSE sidecars of kept files, jsoncpp's and jnipp's licenses). README.md stays as provenance for the vendored version. * ci/android: carry the quest flavor's debug apk as an artifact assembleDebug already builds every flavor, so the quest build compiles on each CI run now that the loader builds through ndk-build with no host cmake step; uploading its apk makes a quest regression visible in the artifact list and gives testers a build to sideload. openxr_input also includes verbosity.h itself instead of leaning on griffin include order for RARCH_ERR. * openxr: parse manifests with libretro-common rjson, drop jsoncpp The loader's JSON use is three manifest/broker walks over a small value tree, so a ~250-line Json::Value subset backed by rjson (loader_json) replaces the vendored jsoncpp - a megabyte of C++ the binary already duplicated, since rjson is compiled into every RetroArch build. The shim keeps jsoncpp's names and the exact semantics the loader relies on: missing members read as a shared null, mutable indexing creates members, extension_version accepts both its string and integer spellings, and the parser takes comments, trailing data and a UTF-8 BOM like the CharReaderBuilder defaults did, so nothing previously loadable becomes unloadable. Verified against the old implementation as an oracle: a harness driving RuntimeManifestFile and ApiLayerManifestFile over valid, relative-path, malformed, wrong-version, field-missing, trailing-data and commented manifests produces byte-identical results on both, runs clean under ASan/UBSan/LeakSan, and the quest, GLES-only and OpenXR-off NDK builds all still link. * android: declare the OpenXR runtime brokers and their permissions The vendored loader discovers the active runtime by querying the ContentProviders at org.khronos.openxr.runtime_broker and org.khronos.openxr.system_runtime_broker (android_utilities.cpp). The quest flavor targets API 34, where package-visibility filtering hides any provider authority the app does not declare, and the manifest carried no queries element at all, so broker resolution was working only at the OS vendor's grace. Declare the two authorities the loader actually queries, together with the Khronos broker permissions - both normal protection level, granted silently at install with no user prompt - so the generic installable broker also serves the app, not just Meta's unenforcing one. Everything lives in the quest overlay, where the loader ships: the headtracking uses-feature in particular must never migrate to the shared manifest, since required=true there would delist the app for every non-VR device on the Play store; a comment now says so. * jni: cleanroom rjni layer in libretro-common, used tree-wide All JNI plumbing moves behind one cleanroom libretro-common layer: rjni registers the process JavaVM once (CAS, first wins), caches each thread's JNIEnv in destructor-capable TLS - GetEnv tells threads the VM already owns, which are left alone, from threads rjni attaches, which are detached again when they exit - and provides lock-free once-caches for class global references, method IDs and field IDs, the VM crossings that make JNI call sites expensive. The exception guard switches to ExceptionCheck, which creates no local reference. The call wrapper macros move here verbatim from platform_unix.h, so every JNI user in the tree shares one header. platform_unix keeps jni_thread_getenv as the entry-point name but it is rjni_env now, with the local key machinery deleted, and the KeyCharacterMap path resolves through process-lifetime rjni caches, so a driver restart re-resolves nothing. Verified with a fake-VM harness under TSan and ASan/UBSan/LeakSan (8 threads, attach/detach balance asserted), a real OpenJDK 21 VM exercising the caches from four native threads, the C89 lane, NDK arm64 at -Werror, and MinGW. * openxr: drop jnipp and android-jni-wrappers, query the broker through rjni The loader's two remaining vendored C++ dependencies existed only to make JNI calls, which the tree now does through libretro-common's rjni, so android_utilities is rewritten on raw JNI with an rjni once-cache for every broker class, method and field - same URIs, same log lines, same installable-then-system fallback - and loader_init_data reads the asset manager and nativeLibraryDir the same way (a dead getApplicationContext call did not survive the rewrite). With jnipp gone this also deletes the only exception-throwing code in the loader, so the Android path is safe under -fno-exceptions unconditionally, and the last C++11 threading construct, jnipp's thread_local, leaves the tree with it. jnipp and android-jni-wrappers are removed from deps, griffin and the Android include paths. Both rewritten files pass standalone NDK arm64 syntax checks, the quest ndk-build links, the GLES-only and plain shapes still build, and the Windows-shape loader amalgam still compiles under MinGW. * openxr: filesystem code on libretro-common file_path/retro_dirent filesystem_utils keeps its interface but its three implementation branches - C++17 <filesystem>, experimental, and the per-platform fallbacks - are replaced by one body over libretro-common's file_path, path_stat and retro_dirent, matching the std::filesystem semantics this build shipped (parent/trailing-slash decomposition, absolute-child replacement in CombinePaths, the Windows canonical no-op). stdfs_conditions.h goes with the branches. Three behavioural deltas, each for the better: FindFilesInPath and GetCanonicalPath return false on a missing path where directory_iterator and std::filesystem::canonical threw (the loader builds -fno-exceptions elsewhere), and ParsePathList no longer corrupts the middle entries of XR_API_LAYER_PATH lists with three or more paths, an upstream substr count bug present in every branch. Verified by a function-level oracle, old implementation against new over a fixture tree (files, subdirs, symlinks, dangling links, path lists): byte-identical except the two corrupted-list lines, now correct; ASan/UBSan/LeakSan clean; and the manifest-file oracle from the rjson conversion rerun on the new filesystem, byte-identical including relative library_path resolution. Quest ndk-build links and the Windows-shape loader amalgam compiles under MinGW. * openxr: remove the loader's exception handling Nothing in the loader throws any more - jsoncpp, jnipp and the std::filesystem calls went in earlier changes - so the exception machinery guarding the C ABI goes too: exception_handling.hpp and the 71 XRLOADER_ABI_TRY/CATCH wrappers around the entry points in loader_core and xr_generated_loader, the empty catch blocks in the ApiLayerInterface and RuntimeInterface destructors, and the dead jsoncpp exception-mode guard in manifest_file. The whole loader now compiles under -fno-exceptions, which the compiler itself enforces as proof that no try, catch or throw remains; griffin keeps building it with exceptions enabled only because glslang shares the TU. The one reachable delta is allocation failure inside an entry point, which terminates instead of unwinding to XR_ERROR_OUT_OF_MEMORY - the loader is statically linked into the frontend, where that is already the outcome everywhere else in the process. Verified with -fno-exceptions compiles of the full loader in Linux, MinGW and NDK arm64 shapes, the manifest-file oracle byte-identical under ASan/UBSan/LeakSan, and quest plus plain ndk-builds linking on the PR's rebased head. * openxr: filesystem_utils on direct libretro-common calls where one fits Every function here is now a direct libretro-common call where one with std::filesystem's semantics exists: PathExists is path_is_valid, CombinePaths joins through fill_pathname_join_special, and the hand-rolled separator macros give way to PATH_CHAR_IS_SLASH and PATH_DEFAULT_SLASH_C; only the env path-list separator keeps a local define, since libretro-common has no such constant. What stays hand-written is documented in place as a deliberate semantic difference from libretro-common's contracts: GetParentPath (fill_pathname_basedir fabricates "./" for a bare filename and keeps trailing slashes), GetAbsolutePath (path_resolve_realpath without symlink resolution would normalise dots, which std::filesystem::absolute does not), ParsePathList (string_split's strtok collapses empty entries), and FindFilesInPath wants bare names where dir_list_new returns full paths, so the retro_dirent primitives are the fit. FileSysUtilsGetCurrentPath had no caller anywhere in the loader and leaves the interface, surviving only as the static getcwd helper behind GetAbsolutePath. The last two <stdexcept> references go too: manifest_file's include was dead since the exception removal, and vulkan_debug_object_namer.hpp was referenced by nothing in the tree. Both oracles rerun byte-identical - the function-level one over the fixture tree and the manifest-file one under ASan/UBSan/LeakSan - and the loader still compiles -fno-exceptions in Linux, MinGW and NDK shapes, with quest and plain ndk-builds linking. * openxr: guard the context drivers' XR platform defines The Android build also passes XR_USE_PLATFORM_ANDROID on the command line, so the bare defines the two OpenXR context drivers carry for standalone compilation redefine it - and the graphics-API macros alongside it are one -D away from the same collision. Wrap all of them in #ifndef so either source of the define wins quietly, whichever compiles the file first in the griffin TU. --------- Co-authored-by: libretroadmin <[email protected]> |
||
|
|
5129d6f84c |
input: an input driver's state call takes one joypad driver
input_driver_t::input_state was handed two joypad drivers: the one there is, and the secondary, "for secondary input devices (eg MFi controllers)". The frontend no longer has a secondary and passed NULL for it at each of its nine calls; no driver did anything with it but silence the warning about not using it. The parameter is out of the interface, of the twenty-nine functions that implement it - every input driver's, the null driver's and the test stand-ins' in samples/ - and of the nine calls, and of the one call a sample makes of a driver's function directly (winraw_keyboards_test, which the sample link check caught). Nothing else changes in any of them. Every parameter list of that call in the tree was checked by script for the new shape, including the drivers that cannot be compiled here. Compiled: the frontend and the Linux drivers (X11, udev, Wayland, SDL 1/2/3, linuxraw, test) with a table entry of the wrong shape made an error; Windows (DirectInput, raw input); Android; the Cocoa driver for macOS; PS4 and QNX against their stand-in headers. Measured, the frame's input work over 300 frames (X11): 4,019,788 instructions to 4,017,937 with no controller, 4,690,524 to 4,688,673 with one and a hotkey enabler. Checked: the X11 keyboard session's log is the same as before; the hotkey and quit-combination sessions log the same lines on the binary before this and the one after; the frontend harness passes every lane; tools/sample_link_check.sh builds the nine samples that link the changed files, and winraw_keyboards_test passes under Wine. With this the secondary joypad is gone from the tree. |
||
|
|
be807cab55 |
input: no driver names the bind tables
The menu, the configuration and the UI get at a bind through input_config_bind() and input_autoconf_bind(); the input drivers were left free to name the two tables, and three did: Android (the Back button's check of the profile's menu toggle), udev and Cocoa (a remapped key's pad binds). Nine reads, all through the calls now. tools/input_state_grab_check.py held the rule for everything outside input/. It holds it for input/ too: input_driver.c and the header that declares the tables are the only files that may name them, with a case for that in its self-test. It is how the Cocoa driver was found - it was not on the list of drivers thought to be left. No change in behaviour: the calls are inline and return the same address. This is the first step of the mapping compiler's order of work (plan revision 1.99, section 21): after it how the binds are kept can change without a driver changing with it. Compiled for Linux (udev), Android and macOS (Cocoa). |
||
|
|
6dda089a9f |
input/android: the frontend reads the keys bound to the RetroPad
The Android driver evaluated a port's key binds itself, for the RetroPad mask and for each button. The frontend does that for every driver that hands it the keys that are down (keys_down), with one set of rules, and keeps what it works out; twelve drivers do. This one now does too: android_input_keys_down() says which of the keys asked about are down, and the driver's own walk of the binds is gone. What it gave is what the frontend gives: a bind counts when it is valid and its key is a key, and bound keys are kept from the RetroPad while the keyboard is the core's, Game Focus excepted. One thing comes with it: a stick's directions bound to keys are answered, which this driver left at nothing. Compiled with the NDK as the Android build does. Not run on a device. |
||
|
|
991b1b996a |
input: drivers that place their own touches use the poll's viewport
The drivers the frontend does not answer for place a touch or a mouse in the viewport themselves, and each asked the video driver for the viewport every time: GameCube/Wii, PS3, PSP and the web on every read of a pointer or lightgun value; Cocoa twice a touch a poll and once a lightgun read; Switch once a touch a poll; Android and QNX once or twice a touch event. The frontend already keeps the viewport once a poll for the drivers that publish. input_driver_poll_viewport() gives it to the others, with two macros that take the place of video_driver_translate_coord_ viewport_wrap() and its confined twin, and those eight drivers use them: one viewport a poll, however many touches and reads. How each places its touches is unchanged. On the frontend's thread only, which is where all eight do it; UWP, which may not, is left as it was. pointer_frame_test checks the viewport is asked for once a poll and afresh at the next. |
||
|
|
1baadb09e5 |
input drivers: the mouse pairs of nine drivers are packed
Each of these was a pair of ints, written and read one axis at a time; each is now one VIDEO_POS_PACK word: - DirectInput: the mouse's motion and position; - raw input: the pointer; - SDL1 and SDL2: the mouse's motion and position, read from SDL into locals and stored once per poll; - PSP and Switch: the mouse's position and motion; - GameCube/Wii: the mouse's position and last position, read into locals and stored once; - Wayland: the pointer's position, last position and motion; - the web: the mouse's position and its two motions; - Android: the mouse's position and motion. A pair set together is stored once; a single axis is set with VIDEO_POS_PUT_X/Y and a running total moved with VIDEO_POS_ADD. |
||
|
|
426013a200 |
video, input: the viewport translation returns two packed positions
video_driver_translate_coord_viewport() returned its result through four 16-bit outputs - x, y, screen x, screen y - so every input driver declared four locals and passed four pointers, and some packed the results again straight after. It returns the position and the screen position as two VIDEO_POS_PACK words now, and its two wrappers take the same two. Every caller is converted: the X11, Wayland, udev, raw input, DirectInput, SDL1/2/3, Cocoa, Android, QNX, web, PSP, PS3, Switch and GameCube/Wii drivers. Where a driver kept the results packed, it passes its own fields straight in (Android, QNX, Cocoa, udev, and Switch, whose four touch arrays become two). udev's mouse pointer helper returns a packed position too. As before, a translation that fails leaves its outputs as they were. The samples that stand in for the function take the new signature. |
||
|
|
7f1cde6cb4 |
android, qnx, sdl3 input: touch and mouse positions are packed
Android kept each touch's viewport, confined and full-screen position, and the mouse's two viewport positions, as pairs of 16-bit values written one at a time; QNX kept each touch's two positions the same way; SDL3 kept its whole-pixel mouse motion as two values. Each pair is now one VIDEO_POS_PACK word. On Android and QNX one helper does a touch's translations into locals and stores each position once; as before, a translation that fails for want of a viewport leaves what was there. |
||
|
|
ca0355e92e |
input: platform drivers ask the frontend for quit, shutdown, menu and video restart
Input drivers on several platforms acted on the frontend themselves when the platform asked: the Wii U's panic combination quit through command_event(); the Wii and GameCube power button, Android's system closing the app and QNX's exit set the shutdown flag through retroarch_ctl(); QNX's swipe down toggled the menu; Android restarted video when its surface was lost; the web driver turned game focus off and let the mouse go when the browser dropped pointer lock; and the test controller's scripted quit used command_event(). They ask now, with input_driver_platform_request() and what happened: INPUT_PLATFORM_QUIT, _SHUTDOWN, _MENU_TOGGLE, _REINIT_VIDEO and _FOCUS_LOST. On the frontend's thread - where every one of these drivers asks today - the frontend does it at once, as before, so nothing about when it happens changes (Android's reinit still comes before it tells the OS it is done). From any other thread the request is a bit in a word the next poll takes whole, with no lock. tools/input_state_grab_check.py fails any file under input/ but the frontend that calls command_event(), retroarch_ctl() or retroarch_main_quit(); there are none now. Checked: the test controller's scripted quit ends a run, through the new call; the frontend harness passes; the Android single-file build compiles; the web driver compiles against the Emscripten headers; the frontend builds with overlays and networking off, and with threads off. The Wii U, Wii, GameCube and QNX drivers are not built here - each change there is the one call - and none was run on its device. |
||
|
|
6da6466e88 |
input: no file under input/ takes a state pointer but the frontend
The last 23, in 11 files, are gone. Nothing under input/ calls config_get_ptr(), input_state_get_ptr(), runloop_state_get_ptr(), menu_state_get_ptr() or video_driver_get_ptr() any more, apart from the frontend itself (input_driver.c, input_driver_choice.c). The replay code (input/bsv/bsvmovie.c), seven: - its four entry points that took no state are handed the input state by their callers, the save-state task and the rewind; - its two inner functions used the state only to say the replay is over, fifteen times between them. That is bsv_movie_set_end() now, and they are handed the replay alone. The platform drivers, fourteen settings reads: named calls, as the others became - Apple (keyboard as gamepad, mouse index, rumble gain, device vibration), Wii and GameCube (mouse index and scale, joypad index), Vita (back touch), Switch (split Joy-Con), webOS (screensaver), udev (the five touch options). Two drivers wrote to the settings, and each has a call that says what it is doing: - the Wii and GameCube joypad driver puts port 1 back on the first pad when only one is left: input_config_set_joypad_index(); - the udev input driver, finding no device on the very first start, makes linuxraw the configured driver: input_driver_first_start_fallback(). The SDL2 input driver took the video driver's data to grab the pointer in its window. The video driver does the grab, sdl2_video_grab_window(), and the input driver asks. The Android input driver held the code that writes SRAM, core options and the configuration when Android takes the application away. That is frontend work; it is retroarch_save_for_suspend() in retroarch.c, as it was, and the driver calls it. tools/input_state_grab_check.py has an empty list, and no exemption for the replay code: a file under input/ that takes one of these fails. Built for Linux and Android; the frontend harness, the four replay tests and the udev devices test pass. The Apple, Wii, GameCube, Vita, Switch and webOS files are not built here. |
||
|
|
2a9892606a |
input: the replay code and the Android drivers ask by name
The replay code took the run loop's state for two things, and the settings twice a frame: - whether the run loop is paused is runloop_get_flags(); - whether the keyboard callback in place is the frontend's own, which is where a replay sends its recorded keys, is runloop_key_event_is_frontend(); - the checkpoint interval and whether a checkpoint is loaded are handed to bsv_movie_next_frame() by the run loop, which has the settings in hand. With a replay on, that is two calls for the settings a frame that are no longer made. It still takes the input state, and stays that way: its state is kept there, so it is the frontend's own code reaching its own data. The check says so (OWN_STATE): that file may take the input state and nothing else. The Android input and joypad drivers read nine settings; each is a named call now, the Android-only ones under ANDROID - sensors, the stylus's four, the disconnect workaround, the physical keyboard, the block timeout, device vibration. One read is left in the Android input driver: it saves the configuration when Android takes the application away. That is frontend work sitting in an input driver, and belongs out of it. Left in tools/input_state_grab_check.py: 16 in 10 files - that one, Apple, the consoles, udev's touch options, webOS, and the SDL2 input driver taking the video driver's window. Built for Linux and Android; the four replay tests and the frontend harness pass. input/bsv/bsvmovie.c fails the syntax gate before this change as after it, on a type the gate's C89 lane does not define. |
||
|
|
2bd0428eea |
input: drivers ask the frontend, the menu and the run loop by name
An input driver that needed to know whether the menu was up, or had to say that the platform's keyboard was showing, took the whole state it lived in and picked the field out: if (menu_state_get_ptr()->flags & MENU_ST_FLAG_ALIVE) input_state_get_ptr()->flags |= INP_FLAG_NATIVE_KB_SHOWN; runloop_state_get_ptr()->flags |= RUNLOOP_FLAG_PAUSED | RUNLOOP_FLAG_IDLE; That ties every driver to the layout of four structures and leaves nothing to say what a driver may read or change. Forty of these are replaced, in eleven files, with a named call on the side that owns the state: - the input frontend: the platform's keyboard is available, is shown; a line of text is being typed, is handed over, is done; pointer input is blocked; game focus; the mouse grab; the input driver's data for a joypad driver that is part of it - the menu: menu_driver_alive(), and the label of the open text entry - the run loop: paused by the platform, content loaded (and runloop_get_flags(), which was there) Each call does what the line it replaces did. No driver under input/ takes the input, menu or run loop state any more, but for the replay code in input/bsv. What is left is listed in tools/input_state_grab_check.py, file by file: 63 in 24 files, of which 52 are a driver reading the settings, 10 the replay code, and one the SDL2 input driver taking the video driver's window. The check runs in CI; a count can go down and not up. Built for Linux, Windows (four raw input tests under Wine) and Android, with the frontend harness. The PSP, PS3, QNX, web and webOS files are not built here. |
||
|
|
bca6a306c1 |
android: the input driver asks the video driver, and does not reach into it
The Android input driver handles the app's lifecycle commands, and for that it took the video driver's state in seven places: to let the context's surface go when the window is taken away, to give it a new one when the window comes back, to ask whether the context is the Vulkan one, and to read the video driver the configuration names while a core has forced another. Those are functions of the video driver now, and the input driver calls them: video_context_surface_create(), _can_create(), _destroy() video_context_driver_is() video_driver_get_configured_ident() The code is the same code, moved: the surface calls are still handed to the video thread under threaded video, and the destroy still waits for the frame that may be using the surface. With this nothing under input/ calls video_state_get_ptr(), nothing under gfx/ calls input_state_get_ptr(), and nothing under gfx/ names an input driver. tools/input_video_separation_check.py's two lists are empty, and CI fails anything that goes back in. Compiled as the Android build compiles it - the single-file build, with the NDK - with no error and no new warning. Not run on a device. |
||
|
|
aa5e71c3ba |
android: the activity lifecycle handshakes take no lock
The NativeActivity callbacks wait on the app thread through frontend/drivers/android_lifecycle.h: a completion count, the acknowledged activity state and a few flags, each an atomic the app thread stores before notifying one eventcount every waiter re-tests its predicate on. The mutex and condvar go. A window or input queue travels with its command through the pipe, so nothing is shared to hand it over. The window is an atomic pointer; the video context holds it across setBuffersGeometry() with window_acquire/window_release, and APP_CMD_TERM_WINDOW retires it, waiting out any holder, before the UI thread may hand it back. samples/frontend/android_lifecycle runs the handshakes with a UI thread, an app thread and a window holder, and is in the TSan list. |
||
|
|
84e0731fc8 |
android: one place writes key presses and releases, with a test
For nine days a press of Back left the keyboard's X key held for good. |
||
|
|
f953aaae96 |
android: a TV remote over HDMI-CEC is not a gamepad
Android turns a television's CEC commands into key events - the arrows, Center and Back - with no input device behind them: device id -1, source AINPUT_SOURCE_HDMI. The driver took an event from an unknown device that is not a keyboard for a new gamepad, and Android names device -1 "Virtual". So the remote became an unconfigured pad called "Virtual" on the next free port: its keys did nothing, and it held a port a controller should have had (issue #19249). Only the NVIDIA SHIELD had a mapping for it. Tell the remote by the event's source instead of by that name, which everything synthetic shares, and handle it the way a keyboard is handled: its keys go to the keyboard row and it gets no pad slot. On that row the arrows are already arrows, Center is already folded into Enter and Back is already the remote's back, so the menu can be driven with it and no profile is needed. The SHIELD keeps its own handling: it maps CEC input onto its "SHIELD Virtual Controller" pad, with an autoconfig profile to match. The source test lives in android_kbd_route.h, which takes no NDK types. samples/input/android_cec_remote builds it on a host and pins that a CEC key registers no pad, whether it is the first event seen or follows a controller; that it lands on the keyboard row; that only the HDMI source is taken for a remote; that a controller, one reporting id -1 included, still gets its pad; and that the SHIELD is left alone. Ignoring the source, as the driver did, is put back by a sabotage mode and asserted to be caught. Compiled with the NDK through the Android unity build. Not run with a television: it needs a set with HDMI-CEC. |
||
|
|
d78aefabd8 |
android: the removed-controller hand-off in a header a host test can build
The mailbox that carries a removed device's id from the listener to the input thread, and the rule that gives a returning pad its old port, were inside android_input.c, which only builds against the NDK. Neither has run on a device yet, and nothing could run them off one. Move both into android_pad_removed.h, free of NDK types, the way android_kbd_route.h holds the keyboard routing: the mailbox as android_removed_post() and android_removed_take(), the pad table as android_pad_mark_removed() and android_pad_find_removed(), with state_device_t alongside. The driver calls them where the code was; its behaviour is unchanged. samples/input/android_pad_removed builds the header on a host and pins: - no removal is lost and none is delivered twice, with three threads posting 6000 ids while the input thread polls (the box is full for about a third of the posts, so the refusal path is under load too); - a full box refuses an id and keeps the ones it holds, ids that are not a physical device's are refused, and id 0 survives; - a returning pad gets its old port back, and of two identical pads it is the removed one's slot it takes. Emptying a removed slot's name, as the first version of the change did, is put back by a sabotage mode and asserted to be caught. Runs under ASan + UBSan and under TSan. Compiled with the NDK through the Android unity build. |
||
|
|
3c47665b3b |
android: the pen mapping in a header a host test can build
How a pen's events become pointer and mouse state was decided inside the motion handler of android_input.c, which only builds against the NDK, so nothing could run it off a device - and nothing has yet run it on one. Move the decision into android_stylus_map.h, free of NDK types, the way android_kbd_route.h holds the keyboard routing. The driver turns a motion event into one of five pen events, calls android_stylus_map() and applies the result: whether to write the position, the right mouse button, and the pointer count to set or leave. The hover guard and proximity timing stay in the driver. No behaviour changes. samples/input/android_stylus_map builds the header on a host and pins the mapping: - a pen is one touch: over 200000 events under random settings, none asks for a pointer count above 1; - the tip pressing is pointer 0 pressed, lifting releases it, and a tip below the pressure threshold moves without pressing; - a hover does not release a finger, and a finger lifting does not release a pressing pen; - the barrel button is the right mouse button, and is let go when the pen leaves range or its gesture is cancelled; - with contact not required, the barrel button presses while hovering. The first version's pointer counts - 2 for the tip, 3 with the barrel button - are put back by a sabotage mode and asserted to be caught. Compiled with the NDK through the Android unity build. |
||
|
|
cf61e93c6c |
android: report a controller the OS has removed as disconnected
Android tells the activity when an input device goes away - a pad switched off, out of range or unplugged - but nothing passed that on to the input driver, and no input event marks a removal. A pad therefore stayed connected for as long as the app ran: - its port kept its device name, so an overlay hidden while a controller is connected never came back; - whatever it was holding stayed held, since no release arrives from a device that is gone; - no disconnect notification was shown, and pausing on disconnect could not happen. RetroActivityCommon.onInputDeviceRemoved now hands the device id to the driver. It is left in a small lock-free mailbox and taken out at the next input poll, which clears the pad's key, axis and hat state and reports the disconnect through input_autoconfigure_disconnect, as the other joypad drivers do. The pad's slot keeps its name and is marked removed instead of being emptied, so the device gets its old port back when it returns, under whatever id Android gives it; its return is reported as a connect. A removed slot is matched before a live one of the same name, so of two identical controllers the one that went away is not taken for the one still connected. A removal is read at the next poll, which can be long after it happened if the app was in the background. If the id resolves again by then, the device has come back under it and nothing is reported. This is the device-removal part of PR #19077, reworked. That version emptied the slot's name, which the driver uses to find a returning device's port: every reconnect would have moved the pad to the next free port. Compiled with the NDK through the Android unity build. Not run on a device. Co-authored-by: f4mrfaux <[email protected]> |
||
|
|
4592b490bd |
Android: Samsung S-Pen stylus support (#19076)
* android: Add Samsung S-Pen stylus input support Stylus input for the Android driver, squashed from PR #19076 and rebased onto current master (three conflicts, all additive: the hover-guard block in android_input.c, an include in runloop.c and the stylus rows in tools/settings_table.reference). - toolType-based stylus/finger classification with an input-source fallback - hover, contact and click handled separately; hover can move the pointer without pressing - phantom-touch suppression for Samsung pens (hover guard, proximity window) - both barrel buttons read - four Android-only settings: input_stylus_enable, input_stylus_require_contact_for_click, input_stylus_hover_moves_pointer, input_stylus_pressure_sensitivity - android_mouse_calculate_deltas computed its fallback delta from the zeroed delta instead of the event position; fixed Closes #15490 Closes #18194 * overlay: hide for a stylus without unloading the pack The S-Pen support unloaded the on-screen overlay from the run loop whenever a stylus became active and loaded it again two seconds after the last pen event. A pen that leaves and returns does that over and over, and each round is the pack's file and texture work, triggered by input while a core runs. It was a full unload because a soft-hidden overlay still took over pointer input: with input_overlay_pointer_enable the overlay poll tracks every touch as its own pointing device and sets INP_FLAG_BLOCK_POINTER_INPUT, so input_state never reaches the driver and the pen's native state (hover included) is lost. Add INPUT_OVERLAY_STYLUS_HIDDEN and make it complete. While it is set the overlay: - is not drawn (alpha 0, as the gamepad soft-hide does); - reads no touches, so the poll releases whatever a finger was holding the way lifting it would, and no hitbox or pointing device sees the pen; - does not answer mouse, lightgun or pointer queries and does not block pointer input. The run loop sets and clears the flag each frame on the current overlay, the way the gamepad soft-hide is driven. Nothing is unloaded or reloaded. * android: report a pen as one pointer, its barrel button as the right mouse button The S-Pen support gave pointer indices a meaning of its own: index 0 was the cursor, index 1 the tip pressing and index 2 the barrel button, with the pointer count raised to 2 or 3 to match. Only a core written for that contract can read it. Everywhere else an index is a separate touch, so a pressing pen looked like two fingers and a press with the barrel button like three - to cores that count pointers, to the on-screen overlay, and to this driver's own lightgun mapping, where two pointers are turbo and three are reload. With the barrel button held but the tip not pressing, index 1 was stale and still inside the count. Map the pen onto the devices the driver already reports instead: - position is pointer 0, and moves without a press while hovering (input_stylus_hover_moves_pointer); - a press is pointer 0 pressed with a count of 1: the tip pressing past the pressure threshold, or, with input_stylus_require_contact_for_click off, the barrel button, touching or hovering; - the barrel button is the right mouse button. This also puts two settings to work. The contact-for-click option and the pressure threshold only fed a latch nothing read; they now decide the press, as their menu text says. The pen no longer switches the driver into mouse mode (mouse_activated). That flag is never cleared, and once set the lightgun position is read from the mouse coordinates, which a pen does not update, so lightgun aim went stale after the first pen contact. The mouse_x_viewport/mouse_y_viewport values it wrote alongside are not read anywhere. A cancelled pen gesture now releases the press like a lift does; before it fell through to the touchscreen path and left the pen's contact latched. Compiled with the NDK through the Android unity build. Not run on a device: it needs a pass on S-Pen hardware before merging. * android: let a mouse's hover events reach the mouse path again The S-Pen support drops every hover event before the source is looked at, so hover cannot be taken for a touch. A mouse moved with no button held reports its motion as hover events too, and they were dropped with the rest: the pointer only moved while a button was down. Drop hover events after the mouse branch instead. Mouse motion is handled as before the stylus work, and hover from any other source is still kept out of the touchscreen path. --------- Co-authored-by: LibretroAdmin <[email protected]> |
||
|
|
ae24f6b50d |
android: let the system keyboard's Backspace reach its text field
With "Use System Keyboard" on, the text being typed lives in a Java-side EditText and the menu line is a copy of it: every change to the field sends the whole text across. A soft keyboard commits most text straight into the field, but sends some keys as key events instead - Backspace when nothing is being composed (so always in something like an IP address), digits on the AOSP keyboard. RetroActivity is a NativeActivity, so those key events come out of the native input queue first, and the views only see one that native code finishes unhandled. android_input_poll_input_default finished every key event handled, so a Backspace never reached the field. Its text kept the characters, and the next character typed sent them back: "192.168.17888", Backspace twice, "." gave "192.168.17888.". While a system keyboard session is open, a key event the soft keyboard sent - AKEY_EVENT_FLAG_SOFT_KEYBOARD or the virtual keyboard's device id - is now finished unhandled and kept out of the native key state and line editor, so the framework forwards it to the field. BACK stays native: the field takes it ahead of the IME to cancel, and one left unhandled would fall through to the activity's own back handling. Hardware keyboards and gamepads are untouched. The decision sits in input/drivers/android_kbd_route.h, free of NDK types, so samples/input/android_kbd_keys can build it on a host. That harness runs the reported sequence through the queue-then-views pipeline and asserts the old behaviour is caught; it is wired into the samples/input workflow. |
||
|
|
8412e7be79 |
android: save before onPause()/onStop() return, not after
A task swiped away from Recents is killed as soon as it drops to the background, which is right after onPause() returns, and a stopped process can be reclaimed once onStop() has returned; neither case delivers onDestroy(). APP_CMD_PAUSE and APP_CMD_STOP are therefore acknowledged only once the one-time background flush of SRAM, core options and retroarch.cfg has run at the top of the next runloop iteration, so the lifecycle callback waiting for the acknowledgement cannot return with the settings unsaved. STOP performs the flush itself when a timed-out PAUSE left it owed, a start or resume supersedes a held acknowledgement, and the startup pump acknowledges at once since nothing is loaded yet. samples/input/android_lifecycle_flush reproduces the handshake with a real UI thread and app thread, with sabotage lanes for acknowledging before the save and for holding the acknowledgement in the pump, and runs under ASan/UBSan and TSan in the samples/input CI workflow. |
||
|
|
dc44cc7b0a |
video: the output size travels as one word, in and out
video_driver_get_output_dims() hands back the word the state already holds and video_driver_set_output_dims() takes one, so a reader gets a coherent pair from a single atomic load rather than two halves split out of it. VIDEO_DRIVER_OUTPUT_WIDTH/HEIGHT were aliases for VIDEO_SCALE_W/H and go with them. The window check hands its size back the same way: check_window on the context-driver vtable, win32_check_window and x11_check_window each take one unsigned* where they took two, and a driver passes the field itself - d3d10, d3d11 and d3d12 give &d3dN->vp.full_dims straight to win32_check_window. The drivers' own size locals travel packed alongside, and the runloop's two aspect checks compare one word against the size they last laid out for. |
||
|
|
bb478c5935 |
(Android) Keep the pending-haptic flag with the driver's other deferred state
The flag is input-driver state, set and read only on the app thread. Hold it as a file static beside android_state_flush_pending rather than in struct android_app, which is shared with the Java thread under the app mutex. Clearing it before the delivery guards also stops a request raised before g_android exists from sticking. |
||
|
|
be6d649385 |
Android: defer keypress haptics to the outer app loop
Record pending keypress feedback in Android app state and dispatch it after runloop_iterate() returns. Coalesce requests per iteration and clear pending feedback on pause, stop, focus loss, window removal, and destruction. Guard delivery by activity, window, focus, and JNI method availability. |
||
|
|
35a3daa09f |
android: only alias DPAD_CENTER to ENTER on the keyboard row
|
||
|
|
4419220efa |
Save core options before core teardown and on Android pause
Core options were only written automatically at the very end of core teardown, in runloop_deinit_core_options(): after the auto save-state, retro_unload_game(), retro_deinit() and dylib_close(). A crash anywhere in that sequence, or the process being killed before it, silently lost every option change made during the session. Per-game "Save Game Options" was unaffected because it writes immediately. - Split the write logic out of core_options_flush() into a quiet helper, runloop_core_options_save(), which writes to whichever options file is active without freeing anything or showing a notification. - Call it at the start of CMD_EVENT_UNLOAD_CORE (Close Content) and CMD_EVENT_CORE_DEINIT (Quit), before anything calls back into the core. The late save in runloop_deinit_core_options() is kept; it is a no-op unless the core changed an option during teardown, since config_file_write() only writes a modified config and clears the flag afterwards. - Call it from android_input_flush_pending_state(), next to the SRAM and config flush, so option changes survive Android killing the process in the background (e.g. swiped away from Recents). Not gated on config_save_on_exit, matching the unload-time save. Verified with a test core that crashes in retro_unload_game(): an option change made at runtime is lost before this change and saved after it. Normal (non-crashing) shutdown behaviour is unchanged. Fixes #19215 |
||
|
|
df2815ce12 |
android: the IME keyboard crosses threads through a mailbox, not a lock
NOT BUILT FOR ANDROID LOCALLY: this machine has no NDK, so android_input.c could not be compiled whole here. The rewritten region compiles clean standalone - gnu99 and pedantic C89 with declaration-after-statement - against micro-stubs of the JNI and glue surface it touches, and the protocol carries a harness, but the file needs a real Android build before this merges anywhere that matters. android_kbd_lock is gone, with the staging buffer and the dirty flag. The UI thread's JNI callback publishes an immutable snapshot of the whole keyboard line - text plus finished/cancel - into a one-slot atomic mailbox: publish is exchange-in, freeing whatever snapshot was never taken, and android_keyboard_poll() on the input thread exchanges it out. Last-wins is the semantics, not a compromise: the Java side sends the whole line on every event and finished arrives on the last one. The open gate is atomic, written at start/end on the input thread and load-acquire checked by the producer; a snapshot racing past a closing gate sits unread and is drained at end and at the next start. Everything else the lock covered - the line buffer, its cursors, the callback - is input-thread-only state and is now plainly that. samples/input/android_kbd_mailbox reproduces the protocol and holds four claims across 3000-event sessions: snapshots are whole (checksummed), the session's final state equals the last published snapshot with finished never lost, a cancel session ends cancelled through the NULL-line callback path, and a snapshot published as the gate closes is drained rather than delivered into the next session. Clean under ASan/UBSan and Clang ThreadSanitizer; a sabotage lane that publishes before filling is caught at 3001 torn snapshots. The Linux build and fifty-entry audit zero are unaffected - this file is not in them - which is exactly why the harness and the Android build note carry the weight here. |
||
|
|
748e685f8b |
android: reach the keybind's key through the accessor in the macro
ANDROID_KEYBOARD_PORT_INPUT_PRESSED() took the key off the bind directly, which the unity build compiles and no other configuration reaches. |
||
|
|
9c413ba74a |
input: reach a keybind's packed fields in every driver
The keybind accessors reach the remaining call sites: the input drivers for Android, Cocoa, DirectInput, DOS, PS3, QNX, RWebInput, SDL, SDL3, udev, UWP, Wayland, WinRaw and X11, and the Qt user-binds page. A build that enables any of those reads enum_idx, key and valid through the accessors like the rest of the tree. |
||
|
|
559962cae0 |
SDL3: Fix On-Screen Keyboard, opt-in for System Keyboard (#19389)
* sdl3: Add On-Screen Keyboard Input See this thread for all the details https://github.com/libretro/RetroArch/pull/19389 |
||
|
|
25fd9971f8 |
android: save the configured video driver on pause, not a core-forced one
The pause-time flush writes the config while a loaded core may still have video_driver overwritten with the renderer it forced, with the user's choice parked in cached_driver_id. Restore the cached name for the duration of the save, as main_exit() does, and put the live value back afterwards so a resumed activity keeps running on the renderer it was using. |
||
|
|
b7113837bc |
android: block on the looper while backgrounded instead of polling it at 100 Hz
APP_CMD_PAUSE/STOP set RUNLOOP_FLAG_IDLE and swap in a stub frame, with the comment "Avoid draining battery while app is not being used." The runloop then returns POLLED_AND_SLEEP every iteration and sleeps 10 ms, and each wake runs android_input_poll(), which drains the looper with a short timeout, finds nothing, and returns. A backgrounded RetroArch woke a hundred times a second to discover it was still backgrounded. Android's doze accounting penalises exactly that pattern. The blocking primitive is already in the file: ALooper_pollOnce(-1) waits until the OS delivers an event, and android_run_events() uses it for the startup pump. When IDLE is set, android_input_poll() now blocks on it; the OS's RESUME command is what wakes the loop, and nothing else needs to. After the first event the remainder of the burst is drained non-blocking so RESUME and INPUT_CHANGED land in one call. The runloop's 10 ms sleep is skipped on Android when IDLE, since the poll already blocked and sleeping again only delays the response. Unfocused-but-foreground is unchanged: the app is visible and the short sleep is right there. No NDK on this machine; runloop.c compiled, the poll body's shape verified C89-clean in isolation. |