Fixes single responsibility principle

src/Linux/Avalonia.LinuxFramebuffer/DrmOutputOptions.cs

@@ -0,0 +1,27 @@
+using Avalonia.LinuxFramebuffer.Output;
+using Avalonia.Media;
+using JetBrains.Annotations;
+
+namespace Avalonia.LinuxFramebuffer
+{
+    public class DrmOutputOptions
+    {
+        /// <summary>
+        /// Scaling factor.
+        /// Default: 1.0
+        /// </summary>
+        public double Scaling { get; set; } = 1.0;
+        
+        /// <summary>
+        /// If true an two cycle buffer swapping is processed at init.
+        /// Default: True
+        /// </summary>
+        public bool EnableInitialBufferSwapping { get; set; } = true;
+        
+        /// <summary>
+        /// Color for <see cref="EnableInitialBufferSwapping"/>
+        /// Default: R0 G0 B0 A0
+        /// </summary>
+        public Color InitialBufferSwappingColor { get; set; } = new Color(0, 0, 0, 0);
+    }
+}

src/Linux/Avalonia.LinuxFramebuffer/LinuxDrmOptions.cs

@@ -1,46 +0,0 @@
-using Avalonia.LinuxFramebuffer.Output;
-using Avalonia.Media;
-using JetBrains.Annotations;
-
-namespace Avalonia.LinuxFramebuffer
-{
-    public class LinuxDrmOptions
-    {
-        /// <summary>
-        /// Path for DrmCard to use, if no <see cref="OutputBackend"/> is passed.
-        /// Default: null
-        /// </summary>
-        [CanBeNull] public string Card { get; set; }
-        
-        /// <summary>
-        /// True to call drmModeGetConnector for all available connectors, otherwise drmModeGetConnectorCurrent is called to get the kernel-cached connected connector.
-        /// Info: since some hardware might have incorrect connector information on startup for some reason, you may need to set this parameter to true.
-        /// Default: False
-        /// </summary>
-        public bool DrmConnectorsForceProbe { get; set; } = false;
-        
-        /// <summary>
-        /// Scaling factor.
-        /// Default: 1.0
-        /// </summary>
-        public double Scaling { get; set; } = 1.0;
-        
-        /// <summary>
-        /// If true an two cycle buffer swapping is processed at init.
-        /// Default: True
-        /// </summary>
-        public bool EnableInitialBufferSwapping { get; set; } = true;
-        
-        /// <summary>
-        /// Color for <see cref="EnableInitialBufferSwapping"/>
-        /// Default: R0 G0 B0 A0
-        /// </summary>
-        public Color InitialBufferSwappingColor { get; set; } = new Color(0, 0, 0, 0);
-        
-        /// <summary>
-        /// IOutputBackend. If Null, a new DrmOutput for <see cref="Card"/> with <see cref="Scaling"/> will be created.
-        /// Default: null
-        /// </summary>
-        [CanBeNull] public IOutputBackend OutputBackend { get; set; }
-    }
-}

src/Linux/Avalonia.LinuxFramebuffer/LinuxFramebufferPlatform.cs

@@ -140,14 +140,8 @@ public static class LinuxFramebufferPlatformExtensions
 
     public static int StartLinuxDrm<T>(this T builder, string[] args, string card = null, double scaling = 1)
         where T : AppBuilderBase<T>, new() => StartLinuxDirect(builder, args, new DrmOutput(card) {Scaling = scaling});
-
+    public static int StartLinuxDrm<T>(this T builder, string[] args, string card = null, bool connectorsForceProbe = false, [CanBeNull] DrmOutputOptions options = null)
-    public static int StartLinuxDrm<T>(this T builder, string[] args, [CanBeNull] LinuxDrmOptions drmOptions)
+        where T : AppBuilderBase<T>, new() => StartLinuxDirect(builder, args, new DrmOutput(card, connectorsForceProbe, options));
-        where T : AppBuilderBase<T>, new()
-    {
-        drmOptions ??= new LinuxDrmOptions();
-        drmOptions.OutputBackend ??= new DrmOutput(drmOptions) {Scaling = drmOptions.Scaling};
-        return StartLinuxDirect(builder, args, drmOptions.OutputBackend);
-    }
     
     public static int StartLinuxDirect<T>(this T builder, string[] args, IOutputBackend backend)
         where T : AppBuilderBase<T>, new()

src/Linux/Avalonia.LinuxFramebuffer/Output/DrmOutput.cs

@@ -7,6 +7,7 @@ using Avalonia.OpenGL;
 using Avalonia.OpenGL.Egl;
 using Avalonia.OpenGL.Surfaces;
 using Avalonia.Platform.Interop;
+using JetBrains.Annotations;
 using static Avalonia.LinuxFramebuffer.NativeUnsafeMethods;
 using static Avalonia.LinuxFramebuffer.Output.LibDrm;
 using static Avalonia.LinuxFramebuffer.Output.LibDrm.GbmColorFormats;
@@ -15,27 +16,32 @@ namespace Avalonia.LinuxFramebuffer.Output
 {
     public unsafe class DrmOutput : IGlOutputBackend, IGlPlatformSurface
     {
-        private LinuxDrmOptions _options;
+        private DrmOutputOptions _outputOptions = new();
         private DrmCard _card;
         public PixelSize PixelSize => _mode.Resolution;
 
         public double Scaling
         {
-            get => _options.Scaling;
+            get => _outputOptions.Scaling;
-            set => _options.Scaling = value;
+            set => _outputOptions.Scaling = value;
         }
         public IGlContext PrimaryContext => _deferredContext;
 
         private EglPlatformOpenGlInterface _platformGl;
         public IPlatformOpenGlInterface PlatformOpenGlInterface => _platformGl;
 
-        public DrmOutput(LinuxDrmOptions drmOptions)
+        public DrmOutput(DrmCard card, DrmResources resources, DrmConnector connector, DrmModeInfo modeInfo,
+            DrmOutputOptions? options = null)
         {
-            _options = drmOptions;
+            if(options != null) 
-            CreateDrmOutput(_options.Card, _options.DrmConnectorsForceProbe);
+                _outputOptions = options;
+            Init(card, resources, connector, modeInfo);
         }
-        public DrmOutput(string path = null) : this(new LinuxDrmOptions() { Card = path })
+        public DrmOutput(string path = null, bool connectorsForceProbe = false, [CanBeNull] DrmOutputOptions options = null)
         {
+            if(options != null) 
+                _outputOptions = options;
+            CreateDrmOutput(path, connectorsForceProbe);
         }
 
         private void CreateDrmOutput(string path = null, bool connectorsForceProbe = false)
@@ -158,9 +164,9 @@ namespace Avalonia.LinuxFramebuffer.Output
 
             using (_deferredContext.MakeCurrent(_eglSurface))
             {
-                _deferredContext.GlInterface.ClearColor(_options.InitialBufferSwappingColor.R,
+                _deferredContext.GlInterface.ClearColor(_outputOptions.InitialBufferSwappingColor.R,
-                    _options.InitialBufferSwappingColor.G, _options.InitialBufferSwappingColor.B,
+                    _outputOptions.InitialBufferSwappingColor.G, _outputOptions.InitialBufferSwappingColor.B,
-                    _options.InitialBufferSwappingColor.A);
+                    _outputOptions.InitialBufferSwappingColor.A);
                 _deferredContext.GlInterface.Clear(GlConsts.GL_COLOR_BUFFER_BIT | GlConsts.GL_STENCIL_BUFFER_BIT);
                 _eglSurface.SwapBuffers();
             }
@@ -178,15 +184,15 @@ namespace Avalonia.LinuxFramebuffer.Output
             _mode = mode;
             _currentBo = bo;
             
-            if (_options.EnableInitialBufferSwapping)
+            if (_outputOptions.EnableInitialBufferSwapping)
             {
                 //Go trough two cycles of buffer swapping (there are render artifacts otherwise)
                 for(var c=0;c<2;c++)
                     using (CreateGlRenderTarget().BeginDraw())
                     {
-                        _deferredContext.GlInterface.ClearColor(_options.InitialBufferSwappingColor.R,
+                        _deferredContext.GlInterface.ClearColor(_outputOptions.InitialBufferSwappingColor.R,
-                            _options.InitialBufferSwappingColor.G, _options.InitialBufferSwappingColor.B,
+                            _outputOptions.InitialBufferSwappingColor.G, _outputOptions.InitialBufferSwappingColor.B,
-                            _options.InitialBufferSwappingColor.A);
+                            _outputOptions.InitialBufferSwappingColor.A);
                         _deferredContext.GlInterface.Clear(GlConsts.GL_COLOR_BUFFER_BIT | GlConsts.GL_STENCIL_BUFFER_BIT);
                     }
             }