From 4f1552c6a220ee915919618fe9200fcef70493c1 Mon Sep 17 00:00:00 2001 From: Nikita Tsukanov Date: Tue, 2 Oct 2018 14:49:52 +0300 Subject: [PATCH] Introduced several 5-line .cs files --- src/Avalonia.OpenGL/EglGlPlatformSurface.cs | 18 ++++++++--------- src/Avalonia.OpenGL/GlDisplayType.cs | 8 ++++++++ src/Avalonia.OpenGL/IGlContext.cs | 8 ++++++++ src/Avalonia.OpenGL/IGlDisplay.cs | 20 ------------------- src/Avalonia.OpenGL/IGlPlatformSurface.cs | 15 -------------- .../IGlPlatformSurfaceRenderTarget.cs | 9 +++++++++ .../IGlPlatformSurfaceRenderingSession.cs | 12 +++++++++++ src/Avalonia.OpenGL/IGlSurface.cs | 10 ++++++++++ src/Gtk/Avalonia.Gtk3/WindowBaseImpl.cs | 8 ++++---- src/Windows/Avalonia.Win32/WindowImpl.cs | 6 +++--- 10 files changed, 63 insertions(+), 51 deletions(-) create mode 100644 src/Avalonia.OpenGL/GlDisplayType.cs create mode 100644 src/Avalonia.OpenGL/IGlContext.cs create mode 100644 src/Avalonia.OpenGL/IGlPlatformSurfaceRenderTarget.cs create mode 100644 src/Avalonia.OpenGL/IGlPlatformSurfaceRenderingSession.cs create mode 100644 src/Avalonia.OpenGL/IGlSurface.cs diff --git a/src/Avalonia.OpenGL/EglGlPlatformSurface.cs b/src/Avalonia.OpenGL/EglGlPlatformSurface.cs index 6eb4a510cb..198c7de8fd 100644 --- a/src/Avalonia.OpenGL/EglGlPlatformSurface.cs +++ b/src/Avalonia.OpenGL/EglGlPlatformSurface.cs @@ -2,17 +2,17 @@ using System; namespace Avalonia.OpenGL { - public interface IEglWindowGlPlatformSurfaceInfo - { - IntPtr Handle { get; } - // TODO: Change to PixelSize struct once https://github.com/AvaloniaUI/Avalonia/pull/1889 is merged - System.Drawing.Size PixelSize { get; } - double Scaling { get; } - - } - public class EglGlPlatformSurface : IGlPlatformSurface { + public interface IEglWindowGlPlatformSurfaceInfo + { + IntPtr Handle { get; } + // TODO: Change to PixelSize struct once https://github.com/AvaloniaUI/Avalonia/pull/1889 is merged + System.Drawing.Size PixelSize { get; } + double Scaling { get; } + + } + private readonly EglDisplay _display; private readonly IGlContext _context; private readonly IEglWindowGlPlatformSurfaceInfo _info; diff --git a/src/Avalonia.OpenGL/GlDisplayType.cs b/src/Avalonia.OpenGL/GlDisplayType.cs new file mode 100644 index 0000000000..2e5178bc37 --- /dev/null +++ b/src/Avalonia.OpenGL/GlDisplayType.cs @@ -0,0 +1,8 @@ +namespace Avalonia.OpenGL +{ + public enum GlDisplayType + { + OpenGL2, + OpenGLES2 + } +} \ No newline at end of file diff --git a/src/Avalonia.OpenGL/IGlContext.cs b/src/Avalonia.OpenGL/IGlContext.cs new file mode 100644 index 0000000000..954567fe2e --- /dev/null +++ b/src/Avalonia.OpenGL/IGlContext.cs @@ -0,0 +1,8 @@ +namespace Avalonia.OpenGL +{ + public interface IGlContext + { + IGlDisplay Display { get; } + void MakeCurrent(IGlSurface surface); + } +} \ No newline at end of file diff --git a/src/Avalonia.OpenGL/IGlDisplay.cs b/src/Avalonia.OpenGL/IGlDisplay.cs index 2d38878b45..e7568bd5e7 100644 --- a/src/Avalonia.OpenGL/IGlDisplay.cs +++ b/src/Avalonia.OpenGL/IGlDisplay.cs @@ -1,5 +1,3 @@ -using System; - namespace Avalonia.OpenGL { public interface IGlDisplay @@ -10,22 +8,4 @@ namespace Avalonia.OpenGL int SampleCount { get; } int StencilSize { get; } } - - public enum GlDisplayType - { - OpenGL2, - OpenGLES2 - } - - public interface IGlContext - { - IGlDisplay Display { get; } - void MakeCurrent(IGlSurface surface); - } - - public interface IGlSurface : IDisposable - { - IGlDisplay Display { get; } - void SwapBuffers(); - } } diff --git a/src/Avalonia.OpenGL/IGlPlatformSurface.cs b/src/Avalonia.OpenGL/IGlPlatformSurface.cs index 4e1adc37e5..22d36b4472 100644 --- a/src/Avalonia.OpenGL/IGlPlatformSurface.cs +++ b/src/Avalonia.OpenGL/IGlPlatformSurface.cs @@ -1,22 +1,7 @@ -using System; - namespace Avalonia.OpenGL { public interface IGlPlatformSurface { IGlPlatformSurfaceRenderTarget CreateGlRenderTarget(); } - - public interface IGlPlatformSurfaceRenderTarget : IDisposable - { - IGlPlatformSurfaceRenderingSession BeginDraw(); - } - - public interface IGlPlatformSurfaceRenderingSession : IDisposable - { - IGlDisplay Display { get; } - // TODO: Change to PixelSize struct once https://github.com/AvaloniaUI/Avalonia/pull/1889 is merged - System.Drawing.Size PixelSize { get; } - double Scaling { get; } - } } diff --git a/src/Avalonia.OpenGL/IGlPlatformSurfaceRenderTarget.cs b/src/Avalonia.OpenGL/IGlPlatformSurfaceRenderTarget.cs new file mode 100644 index 0000000000..53da93315c --- /dev/null +++ b/src/Avalonia.OpenGL/IGlPlatformSurfaceRenderTarget.cs @@ -0,0 +1,9 @@ +using System; + +namespace Avalonia.OpenGL +{ + public interface IGlPlatformSurfaceRenderTarget : IDisposable + { + IGlPlatformSurfaceRenderingSession BeginDraw(); + } +} \ No newline at end of file diff --git a/src/Avalonia.OpenGL/IGlPlatformSurfaceRenderingSession.cs b/src/Avalonia.OpenGL/IGlPlatformSurfaceRenderingSession.cs new file mode 100644 index 0000000000..22641d7b53 --- /dev/null +++ b/src/Avalonia.OpenGL/IGlPlatformSurfaceRenderingSession.cs @@ -0,0 +1,12 @@ +using System; + +namespace Avalonia.OpenGL +{ + public interface IGlPlatformSurfaceRenderingSession : IDisposable + { + IGlDisplay Display { get; } + // TODO: Change to PixelSize struct once https://github.com/AvaloniaUI/Avalonia/pull/1889 is merged + System.Drawing.Size PixelSize { get; } + double Scaling { get; } + } +} \ No newline at end of file diff --git a/src/Avalonia.OpenGL/IGlSurface.cs b/src/Avalonia.OpenGL/IGlSurface.cs new file mode 100644 index 0000000000..499d0a3c90 --- /dev/null +++ b/src/Avalonia.OpenGL/IGlSurface.cs @@ -0,0 +1,10 @@ +using System; + +namespace Avalonia.OpenGL +{ + public interface IGlSurface : IDisposable + { + IGlDisplay Display { get; } + void SwapBuffers(); + } +} \ No newline at end of file diff --git a/src/Gtk/Avalonia.Gtk3/WindowBaseImpl.cs b/src/Gtk/Avalonia.Gtk3/WindowBaseImpl.cs index 1cae363d96..0ec4047086 100644 --- a/src/Gtk/Avalonia.Gtk3/WindowBaseImpl.cs +++ b/src/Gtk/Avalonia.Gtk3/WindowBaseImpl.cs @@ -15,7 +15,7 @@ using Avalonia.Threading; namespace Avalonia.Gtk3 { - abstract class WindowBaseImpl : IWindowBaseImpl, IPlatformHandle, IEglWindowGlPlatformSurfaceInfo + abstract class WindowBaseImpl : IWindowBaseImpl, IPlatformHandle, EglGlPlatformSurface.IEglWindowGlPlatformSurfaceInfo { public readonly GtkWindow GtkWidget; private IInputRoot _inputRoot; @@ -510,7 +510,7 @@ namespace Avalonia.Gtk3 : new ImmediateRenderer(root); } - System.Drawing.Size IEglWindowGlPlatformSurfaceInfo.PixelSize + System.Drawing.Size EglGlPlatformSurface.IEglWindowGlPlatformSurfaceInfo.PixelSize { get { @@ -519,7 +519,7 @@ namespace Avalonia.Gtk3 (int)Math.Max(1, LastKnownScaleFactor * ClientSize.Height)); } } - double IEglWindowGlPlatformSurfaceInfo.Scaling => LastKnownScaleFactor; - IntPtr IEglWindowGlPlatformSurfaceInfo.Handle => Handle.Handle; + double EglGlPlatformSurface.IEglWindowGlPlatformSurfaceInfo.Scaling => LastKnownScaleFactor; + IntPtr EglGlPlatformSurface.IEglWindowGlPlatformSurfaceInfo.Handle => Handle.Handle; } } diff --git a/src/Windows/Avalonia.Win32/WindowImpl.cs b/src/Windows/Avalonia.Win32/WindowImpl.cs index d81f96a964..65580ff9c8 100644 --- a/src/Windows/Avalonia.Win32/WindowImpl.cs +++ b/src/Windows/Avalonia.Win32/WindowImpl.cs @@ -19,7 +19,7 @@ using static Avalonia.Win32.Interop.UnmanagedMethods; namespace Avalonia.Win32 { - public class WindowImpl : IWindowImpl, IEglWindowGlPlatformSurfaceInfo + public class WindowImpl : IWindowImpl, EglGlPlatformSurface.IEglWindowGlPlatformSurfaceInfo { private static readonly List s_instances = new List(); @@ -928,7 +928,7 @@ namespace Avalonia.Win32 _topmost = value; } - System.Drawing.Size IEglWindowGlPlatformSurfaceInfo.PixelSize + System.Drawing.Size EglGlPlatformSurface.IEglWindowGlPlatformSurfaceInfo.PixelSize { get { @@ -939,6 +939,6 @@ namespace Avalonia.Win32 Math.Max(1, rect.bottom - rect.top)); } } - IntPtr IEglWindowGlPlatformSurfaceInfo.Handle => Handle.Handle; + IntPtr EglGlPlatformSurface.IEglWindowGlPlatformSurfaceInfo.Handle => Handle.Handle; } }