Revert "Merge pull request ppy#6268 from Susko3/dont-overload-Display…

…Handle" This reverts commit d73af6c, reversing changes made to f7718ea.
peppy · May 21, 2024 · e2f5b3d · e2f5b3d
1 parent e6d363a
commit e2f5b3d
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 30 deletions.
diff --git a/osu.Framework.Android/AndroidGameWindow.cs b/osu.Framework.Android/AndroidGameWindow.cs
@@ -9,7 +9,7 @@ namespace osu.Framework.Android
 {
     internal class AndroidGameWindow : SDL3MobileWindow
     {
-        public override IntPtr SurfaceHandle => AndroidGameActivity.Surface.NativeSurface?.Handle ?? IntPtr.Zero;
+        public override IntPtr DisplayHandle => AndroidGameActivity.Surface.NativeSurface?.Handle ?? IntPtr.Zero;
 
         public AndroidGameWindow(GraphicsSurfaceType surfaceType, string appName)
             : base(surfaceType, appName)

diff --git a/osu.Framework/Graphics/Veldrid/VeldridDevice.cs b/osu.Framework/Graphics/Veldrid/VeldridDevice.cs
@@ -162,15 +162,15 @@ public VeldridDevice(IGraphicsSurface graphicsSurface)
                 {
                     var linuxGraphics = (ILinuxGraphicsSurface)this.graphicsSurface;
                     swapchain.Source = linuxGraphics.IsWayland
-                        ? SwapchainSource.CreateWayland(linuxGraphics.DisplayHandle, this.graphicsSurface.WindowHandle)
-                        : SwapchainSource.CreateXlib(linuxGraphics.DisplayHandle, this.graphicsSurface.WindowHandle);
+                        ? SwapchainSource.CreateWayland(this.graphicsSurface.DisplayHandle, this.graphicsSurface.WindowHandle)
+                        : SwapchainSource.CreateXlib(this.graphicsSurface.DisplayHandle, this.graphicsSurface.WindowHandle);
                     break;
                 }
 
                 case RuntimeInfo.Platform.Android:
                 {
                     var androidGraphics = (IAndroidGraphicsSurface)this.graphicsSurface;
-                    swapchain.Source = SwapchainSource.CreateAndroidSurface(androidGraphics.SurfaceHandle, androidGraphics.JniEnvHandle);
+                    swapchain.Source = SwapchainSource.CreateAndroidSurface(this.graphicsSurface.DisplayHandle, androidGraphics.JniEnvHandle);
                     break;
                 }
             }

diff --git a/osu.Framework/Platform/IAndroidGraphicsSurface.cs b/osu.Framework/Platform/IAndroidGraphicsSurface.cs
@@ -11,11 +11,5 @@ public interface IAndroidGraphicsSurface
         /// Returns JNI environment handle.
         /// </summary>
         IntPtr JniEnvHandle { get; }
-
-        /// <summary>
-        /// Android Surface handle.
-        /// </summary>
-        /// <remarks>https://developer.android.com/reference/android/view/Surface.html</remarks>
-        IntPtr SurfaceHandle { get; }
     }
 }
diff --git a/osu.Framework/Platform/IGraphicsSurface.cs b/osu.Framework/Platform/IGraphicsSurface.cs
@@ -16,6 +16,12 @@ public interface IGraphicsSurface
         /// </summary>
         IntPtr WindowHandle { get; }
 
+        /// <summary>
+        /// A pointer representing a handle to the display containing this window, provided by the operating system.
+        /// This is specific to X11/Wayland subsystems.
+        /// </summary>
+        IntPtr DisplayHandle { get; }
+
         /// <summary>
         /// The type of surface.
         /// </summary>

diff --git a/osu.Framework/Platform/ILinuxGraphicsSurface.cs b/osu.Framework/Platform/ILinuxGraphicsSurface.cs
@@ -1,8 +1,6 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
-using System;
-
 namespace osu.Framework.Platform
 {
     public interface ILinuxGraphicsSurface
@@ -11,11 +9,5 @@ public interface ILinuxGraphicsSurface
         /// Whether the current display server is Wayland.
         /// </summary>
         bool IsWayland { get; }
-
-        /// <summary>
-        /// A pointer representing a handle to the display containing this window, provided by the operating system.
-        /// This is specific to X11/Wayland subsystems.
-        /// </summary>
-        IntPtr DisplayHandle { get; }
     }
 }
diff --git a/osu.Framework/Platform/SDL/SDL3GraphicsSurface.cs b/osu.Framework/Platform/SDL/SDL3GraphicsSurface.cs
@@ -21,6 +21,7 @@ internal unsafe class SDL3GraphicsSurface : IGraphicsSurface, IOpenGLGraphicsSur
         private IntPtr context;
 
         public IntPtr WindowHandle => window.WindowHandle;
+        public IntPtr DisplayHandle => window.DisplayHandle;
 
         public GraphicsSurfaceType Type { get; }
 
@@ -215,19 +216,13 @@ bool IOpenGLGraphicsSurface.VerticalSync
 
         bool ILinuxGraphicsSurface.IsWayland => window.IsWayland;
 
-        [SupportedOSPlatform("linux")]
-        IntPtr ILinuxGraphicsSurface.DisplayHandle => window.DisplayHandle;
-
         #endregion
 
         #region Android-specific implementation
 
         [SupportedOSPlatform("android")]
         IntPtr IAndroidGraphicsSurface.JniEnvHandle => SDL3.SDL_AndroidGetJNIEnv();
 
-        [SupportedOSPlatform("android")]
-        IntPtr IAndroidGraphicsSurface.SurfaceHandle => window.SurfaceHandle;
-
         #endregion
     }
 }
diff --git a/osu.Framework/Platform/SDL3Window.cs b/osu.Framework/Platform/SDL3Window.cs
@@ -5,7 +5,6 @@
 using System.IO;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-using System.Runtime.Versioning;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Configuration;
@@ -120,8 +119,7 @@ public IntPtr WindowHandle
             }
         }
 
-        [SupportedOSPlatform("linux")]
-        public IntPtr DisplayHandle
+        public virtual IntPtr DisplayHandle
         {
             get
             {
@@ -140,9 +138,6 @@ public IntPtr DisplayHandle
             }
         }
 
-        [SupportedOSPlatform("android")]
-        public virtual IntPtr SurfaceHandle => throw new PlatformNotSupportedException();
-
         public bool CapsLockPressed => SDL3.SDL_GetModState().HasFlagFast(SDL_Keymod.SDL_KMOD_CAPS);
 
         /// <summary>