forked from ppy/osu
-
Notifications
You must be signed in to change notification settings - Fork 0
Android: fix OpenGL black screen regression from PR #286 #287
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.
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
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -253,25 +253,38 @@ protected override void OnCreate(Bundle? savedInstanceState) | |
|
|
||
| if (holder != null) | ||
| { | ||
| // Request RGBA8888 on the Android SurfaceHolder unconditionally BEFORE | ||
| // registering our callback. Without this, Android defaults to RGB565 | ||
| // for the SurfaceView when no renderer explicitly requests a different | ||
| // format — SDL3 only calls setFormat(RGBA8888) for OpenGL, not Vulkan, | ||
| // so Vulkan sessions receive an RGB565 ANativeWindow. An RGB565 swapchain | ||
| // is incompatible with our 8-bit-per-channel rendering pipeline and | ||
| // causes a black screen followed by a native Draw-thread crash on Adreno | ||
| // GPUs (evidenced by SDL_PIXELFORMAT_RGB565 + "drawable size 3088×1440" | ||
| // in the runtime log for every Vulkan crash session). RGBA8888 is what | ||
| // OpenGL already uses and is the correct baseline for all renderers. | ||
| // Calling SetFormat before AddCallback ensures the format is stamped | ||
| // on the SurfaceHolder before SDL creates the VkAndroidSurfaceKHR. | ||
| try | ||
| // Only request RGBA8888 on the SurfaceHolder when the configured | ||
| // renderer is Vulkan. SDL3 already calls setFormat(RGBA8888) for | ||
| // OpenGL/GLES from its own EGL surface initialization, and calling | ||
| // setFormat() a second time AFTER SDL has bound its EGL surface | ||
| // forces Android to recreate the surface (surfaceDestroyed → | ||
| // surfaceCreated → surfaceChanged) mid-frame. That: | ||
| // 1. Trips the 250ms drawThreadAcknowledgedTeardown wait in | ||
| // AndroidGameSurface.SurfaceDestroyed (visible warning in HUD). | ||
| // 2. Leaves SDL's EGL surface bound to a destroyed ANativeWindow, | ||
| // causing eglSwapBuffers to silently no-op → permanent black | ||
| // screen while Update/Audio/Input keep running. | ||
| // SDL3 does NOT call setFormat on the Vulkan path, so Vulkan still | ||
| // needs this stamping to avoid the RGB565 default that crashes Adreno. | ||
| bool isVulkan = false; | ||
| try { isVulkan = LogManagement.IsVulkanConfigured(); } | ||
| catch (Exception e) { Debug.WriteLine($"[osu!] SurfaceHolder format gate: IsVulkanConfigured failed, defaulting to skip SetFormat: {e.Message}"); } | ||
|
|
||
| if (isVulkan) | ||
| { | ||
| holder.SetFormat(global::Android.Graphics.Format.Rgba8888); | ||
| try | ||
| { | ||
| holder.SetFormat(global::Android.Graphics.Format.Rgba8888); | ||
| Logger.Log("[osu!] SurfaceHolder.SetFormat(Rgba8888) applied (Vulkan renderer).", LoggingTarget.Runtime, LogLevel.Important); | ||
| } | ||
| catch (Exception e) | ||
| { | ||
| Debug.WriteLine($"[osu!] Failed to request RGBA8888 surface format: {e.Message}"); | ||
| } | ||
| } | ||
| catch (Exception e) | ||
| else | ||
| { | ||
| Debug.WriteLine($"[osu!] Failed to request RGBA8888 surface format: {e.Message}"); | ||
| Logger.Log("[osu!] SurfaceHolder.SetFormat skipped (OpenGL/Auto renderer — SDL3 handles format).", LoggingTarget.Runtime, LogLevel.Important); | ||
| } | ||
|
Comment on lines
+277
to
288
|
||
|
|
||
| holder.AddCallback(this); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The surface-format gate only checks
LogManagement.IsVulkanConfigured(), which returns true only whenframework.inicontainsRenderer=Vulkan. If a user hasRenderer=Automaticand the framework resolves that to Vulkan (whichLogManagement.NormaliseFrameworkIniRendererDefault()’s XML docs state is the Android default), this will skipSetFormat()and the Vulkan path can still inherit RGB565. Consider treatingAutomaticas Vulkan here (or introduce a helper likeLogManagement.ShouldForceRgba8888Surface()that covers bothVulkanandAutomaticwhen Vulkan is actually in use), so Vulkan-by-automatic doesn’t regress.