Skip to content

Fix Vulkan flickering, Oboe visibility, and restore performance optimizations #136

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
winnerspiros merged 2 commits into from
Apr 2, 2026
Merged

Fix Vulkan flickering, Oboe visibility, and restore performance optimizations #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
663c3dc
Fix Vulkan flickering, Oboe visibility, and restore performance optim…
google-labs-jules[bot] Apr 2, 2026
8c2c68f
Fix Vulkan flickering, Oboe visibility, and restore performance optim…
google-labs-jules[bot] Apr 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions osu.Android/OboeAudioRedirector.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ public void RefreshMixers(int hardwareSampleRate)

Console.WriteLine($"[osu!] Oboe redirector: Refreshing mixers with rate {lastHardwareSampleRate}Hz");
restoreDefaultAudio();
mixerHandles.Clear();
originalParents.Clear();

sampleRate = lastHardwareSampleRate;
mixerHandles.Clear();
Expand Down Expand Up @@ -79,6 +81,8 @@ public void RefreshMixers(int hardwareSampleRate)
{
Console.WriteLine("[osu!] Oboe redirector: Failed to setup master mixer, restoring default audio.");
restoreDefaultAudio();
mixerHandles.Clear();
originalParents.Clear();
return;
}

Expand Down Expand Up @@ -326,6 +330,8 @@ private static int provideAudio(IntPtr audioData, int numFrames)
public void Dispose()
{
restoreDefaultAudio();
mixerHandles.Clear();
originalParents.Clear();
}
}
}
40 changes: 20 additions & 20 deletions osu.Android/OsuGameAndroid.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ public partial class OsuGameAndroid : OsuGame
private readonly IHighPerformanceSessionManager highPerformanceSessionManager = new AndroidHighPerformanceSessionManager();

private OboeAudioRedirector? audioRedirector;
private IDisposable? highPerformanceSession;
private Delegate? activeMixersHandler;
private object? activeMixersList;

Expand Down Expand Up @@ -208,27 +209,13 @@ protected override void LoadComplete()

try
{
// Target 1ms (1,000,000ns) for 1000 FPS target.


Scheduler.Add(() =>
{
Host.DrawThread.Scheduler.Add(() =>
{
try
{


Debug.WriteLine("[osu!] ADPF Performance Hint Session created for Render thread");
}
catch { }
});
});

Debug.WriteLine("[osu!] ADPF Performance Hint Session created for Update thread");
applyPerformanceOptimizations(performanceMode.Value);
Debug.WriteLine("[osu!] Performance optimizations applied in LoadComplete");
}
catch (Exception e)
{
Debug.WriteLine($"[osu!] Failed to apply performance optimizations: {e.Message}");
}
catch { }

UserPlayingState.BindValueChanged(_ => updateOrientation());

performanceMode.BindValueChanged(e =>
Expand Down Expand Up @@ -335,6 +322,17 @@ private void applyPerformanceOptimizations(bool enabled)
{
gameActivity.Window?.SetSustainedPerformanceMode(enabled);

if (enabled)
{
highPerformanceSession?.Dispose();
highPerformanceSession = highPerformanceSessionManager.BeginSession();
}
else
{
highPerformanceSession?.Dispose();
highPerformanceSession = null;
}

if (enabled)
selectHighestRefreshRate();
}
Expand Down Expand Up @@ -542,6 +540,8 @@ protected override void Dispose(bool isDisposing)

if (nativeBridges != null)
disposeNativeBridges();
highPerformanceSession?.Dispose();
highPerformanceSession = null;
}
}

Expand Down
18 changes: 9 additions & 9 deletions osu.Game/Graphics/UserInterface/FPSCounter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,14 @@
/// </summary>
private double lastDisplayRequiredTime;

[Resolved]
[Resolved(canBeNull: true)]
private OsuColour colours { get; set; } = null!;

[Resolved]
protected OsuGame Game { get; private set; } = null!;
[Resolved(canBeNull: true)]
protected OsuGameBase? Game { get; private set; } = null!;

Check warning

Code scanning / InspectCode

Redundant member initializer Warning

Initializing property by default value is redundant

[Resolved]
private GameHost host { get; set; } = null!;
[Resolved(canBeNull: true)]
private GameHost? host { get; set; } = null!;

Check warning

Code scanning / InspectCode

Redundant member initializer Warning

Initializing property by default value is redundant

public FPSCounter()
{
Expand Down Expand Up @@ -240,12 +240,12 @@
counterDrawFPS.Colour = getColour(displayedFpsCount / aimDrawFPS);
string status = $"{displayedFpsCount:#,0} fps";

if (Game is OsuGame osu)
if (Game != null)
{
status += $" | {host.ResolvedRenderer.ToString()}";
status += $" | {host?.ResolvedRenderer.ToString()}";

if (osu.IsOboeActive)
status += $" | Oboe: {osu.OboeStatus} ({osu.OboeLatency:F1}ms)";
if (Game.IsOboeActive)
status += $" | Oboe: {Game.OboeStatus} ({Game.OboeLatency:F1}ms)";
}

counterDrawFPS.Text = status;
Expand Down
Loading