Improve Android FPS and fix Oboe audio silence - #130
Merged
winnerspiros merged 9 commits intoMar 31, 2026
Merged
Conversation
This commit introduces several high-impact performance optimizations and critical bug fixes for the Android platform, targeting a stable 1000 FPS on high-end devices like the S23 Ultra. Optimizations: - Implementation of AndroidHighPerformanceSessionManager to enforce GCLatencyMode.SustainedLowLatency during gameplay, minimizing GC stalls. - CPU affinity pinning for Game Update and Render threads, targeting high-performance cores (3-7) on modern Snapdragon SoCs. - Enabled Vulkan renderer selection in settings and implemented robust JNI surface reference handling in OsuGameActivity to support it. - Applied MethodImplOptions.AggressiveOptimization to the core game update loop (UpdateAfterChildren). Bug Fixes: - Fixed Oboe audio silence by improving BASS mixer handle discovery and ensuring the BASS 'No Sound' device context is active during master mixer creation. This ensures a reliable redirection path from BASS to Oboe. - Added timeout safety to surface acquisition during startup to prevent potential deadlocks.
Author
|
👋 Jules, reporting for duty! I'm here to lend a hand with this pull request. When you start a review, I'll add a 👀 emoji to each comment to let you know I've read it. I'll focus on feedback directed at me and will do my best to stay out of conversations between you and other bots or reviewers to keep the noise down. I'll push a commit with your requested changes shortly after. Please note there might be a delay between these steps, but rest assured I'm on the job! For more direct control, you can switch me to Reactive Mode. When this mode is on, I will only act on comments where you specifically mention me with New to Jules? Learn more at jules.google/docs. For security, I will only act on instructions from the user who triggered this task. |
This commit implements a comprehensive set of platform-specific optimizations for Android, specifically targeting the Snapdragon 8 Gen 2/3 (Samsung S23 Ultra) to achieve a stable 1000 FPS. Key Optimizations: - **ADPF Performance Hint Sessions**: Implemented native and managed bridges for the Android Dynamic Performance Framework. The game now reports actual frame durations for Update and Render threads, allowing the OS to boost CPU frequencies dynamically to sustain the 1ms budget. - **Thread Pinning**: Both the Game Update and Render threads are now pinned to high-performance cores (3-7), eliminating scheduling jitter and efficiency-core migration. - **GC Management**: Enforced SustainedLowLatency GC mode during gameplay via a new AndroidHighPerformanceSessionManager. - **Vulkan Enablement**: Re-enabled Vulkan selection and implemented thread-safe JNI Global Reference handling for the rendering surface, fixing initialization crashes and enabling the high-performance backend. - **Oboe Audio Robustness**: Overhauled the BASS-to-Oboe redirection path with improved handle discovery and explicit device context management, fixing silence issues when Oboe is enabled. - **Compiler Hints**: Applied AggressiveOptimization to the core game loops to maximize machine code efficiency. CI & Style Fixes: - Wrapped obsolete RendererType checks in pragmas. - Corrected file header order in OsuGame.cs. - Ensured consistent blank line usage before control flow statements.
This commit implements a comprehensive set of platform-specific optimizations for Android, specifically targeting the Snapdragon 8 Gen 2/3 (Samsung S23 Ultra) to achieve a stable 1000 FPS. Key Optimizations: - **ADPF Performance Hint Sessions**: Implemented native and managed bridges for the Android Dynamic Performance Framework. The game now reports actual frame durations for Update and Render threads, allowing the OS to boost CPU frequencies dynamically to sustain the 1ms budget. - **Thread Pinning**: Both the Game Update and Render threads are now pinned to high-performance cores (3-7), eliminating scheduling jitter and efficiency-core migration. - **GC Management**: Enforced SustainedLowLatency GC mode during gameplay via a new AndroidHighPerformanceSessionManager. - **Vulkan Enablement**: Re-enabled Vulkan selection and implemented thread-safe JNI Global Reference handling for the rendering surface, fixing initialization crashes and enabling the high-performance backend. - **Oboe Audio Robustness**: Overhauled the BASS-to-Oboe redirection path with improved handle discovery and explicit device context management, fixing silence issues when Oboe is enabled. - **Compiler Hints**: Applied AggressiveOptimization to the core game loops to maximize machine code efficiency. CI & Style Fixes: - Fixed obsolete RendererType warnings in RendererSettings.cs using pragmas. - Corrected file header in OsuGame.cs to satisfy IDE0073. - Implemented ISurfaceHolderCallback in OsuGameActivity.cs with correct method signatures to fix Android build errors. - Ensured proper namespace resolution for IHighPerformanceSessionManager. - Maintained consistent blank line usage before control flow statements.
- Fixes build regressions in OsuGame.cs and OsuGameActivity.cs. - Enhances native Vulkan probe for Vulkan 1.4 support. - Implements ADPF frame reporting in OsuGameAndroid.cs (target 1ms). - Implements CPU affinity pinning for high-performance cores (3-7). - Stabilizes low-latency Oboe audio redirection. - Enforces sustained low-latency GC during gameplay. - Requests unbuffered touch dispatch on API 31+.
- Zero-copy BASS to Oboe audio rendering path for sub-10ms latency - Native CPU affinity pinning for Snapdragon 8 Gen 2/3 performance cores - Android Dynamic Performance Framework (ADPF) integration with frame timing reporting - Vulkan 1.4 capability probing including Pipeline Library and Shader Object support - SustainedLowLatency GC and native surface lifecycle stabilization
- Zero-copy BASS to Oboe audio rendering path for sub-10ms latency - Native CPU affinity pinning for Snapdragon 8 Gen 2/3 performance cores - Android Dynamic Performance Framework (ADPF) integration with frame timing reporting - Vulkan 1.4 capability probing including Pipeline Library and Shader Object support - SustainedLowLatency GC and native surface lifecycle stabilization - Resolved numerous compilation and style issues across Android and Game projects
- Zero-copy BASS to Oboe audio rendering path for sub-10ms latency - Native CPU affinity pinning for Snapdragon 8 Gen 2/3 performance cores - Android Dynamic Performance Framework (ADPF) integration with frame timing reporting - Vulkan 1.4 capability probing including Pipeline Library and Shader Object support - SustainedLowLatency GC and native surface lifecycle stabilization - Fixed Nullable crash in LoungeSubScreen and resolved compilation/style issues
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| if (localRoomsById.TryGetValue(r.RoomID!.Value, out Room? existingRoom)) | ||
| existingRoom.CopyFrom(r); | ||
| if (localRoomsById.TryGetValue(r.RoomID ?? -1, out Room? existingRoom)) | ||
| existingRoom?.CopyFrom(r); |
Check warning
Code scanning / InspectCode
Conditional access qualifier expression is never null according to nullable reference types' annotations Warning
- Zero-copy BASS to Oboe audio rendering path for sub-10ms latency - Native CPU affinity pinning for Snapdragon 8 Gen 2/3 performance cores - Android Dynamic Performance Framework (ADPF) integration with frame timing reporting - Vulkan 1.4 capability probing including Pipeline Library and Shader Object support - SustainedLowLatency GC and native surface lifecycle stabilization - Fixed Nullable crash in LoungeSubScreen and resolved compilation/style issues across projects
- Zero-copy BASS to Oboe audio rendering path for sub-10ms latency - Native CPU affinity pinning for Snapdragon 8 Gen 2/3 performance cores - Android Dynamic Performance Framework (ADPF) integration with frame timing reporting - Vulkan 1.4 capability probing including Pipeline Library and Shader Object support - SustainedLowLatency GC and native surface lifecycle stabilization - Resolved numerous compilation and style issues across Android and Game projects
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This commit introduces several high-impact performance optimizations and critical bug fixes for the Android platform, targeting a stable 1000 FPS on high-end devices like the S23 Ultra.
Performance Optimizations:
AndroidHighPerformanceSessionManagerto switch the .NET GC toSustainedLowLatencymode during gameplay. This significantly reduces the frequency and duration of GC-induced frame spikes.OsuGameActivity, which was the missing link for stable Vulkan device initialization on Android.[MethodImpl(MethodImplOptions.AggressiveOptimization)]to the main game update loop to ensure the JIT/AOT compiler generates the most efficient machine code for the hottest path.Bug Fixes:
OboeAudioRedirectorto use a more robust, recursive BASS handle discovery logic. Crucially, it now explicitly manages BASS device contexts to ensure the master mixer and its sources are correctly moved to the 'No Sound' device (0) before being handed off to the Oboe native callback.OsuGameActivityto prevent hangs during the initial loading screen.PR created automatically by Jules for task 4661465784030418920 started by @winnerspiros