mirror of
https://github.com/GreemDev/Ryujinx
synced 2025-01-08 12:06:53 +01:00
6c515e1822
* dotnet format style --severity info Some changes were manually reverted. * dotnet format analyzers --serverity info Some changes have been minimally adapted. * Restore a few unused methods and variables * Silence dotnet format IDE0060 warnings * Silence dotnet format IDE0052 warnings * Silence dotnet format IDE0059 warnings * Address or silence dotnet format IDE1006 warnings * Address dotnet format CA1816 warnings * Address dotnet format CA1822 warnings * Address or silence dotnet format CA1069 warnings * Make dotnet format succeed in style mode * Address dotnet format CA1401 warnings * Address remaining dotnet format analyzer warnings * Address review comments * dotnet-format fixes after rebase * Address most dotnet format whitespace warnings * Apply dotnet format whitespace formatting A few of them have been manually reverted and the corresponding warning was silenced * Format if-blocks correctly * Another rebase, another dotnet format run * Run dotnet format whitespace after rebase * Run dotnet format style after rebase * Run dotnet format after rebase and remove unused usings - analyzers - style - whitespace * Add comments to disabled warnings * Remove a few unused parameters * Simplify properties and array initialization, Use const when possible, Remove trailing commas * Start working on disabled warnings * Fix and silence a few dotnet-format warnings again * Address IDE0260 warnings * Address a few disabled IDE0060 warnings * Silence IDE0060 in .editorconfig * Revert "Simplify properties and array initialization, Use const when possible, Remove trailing commas" This reverts commit 9462e4136c0a2100dc28b20cf9542e06790aa67e. * dotnet format whitespace after rebase * dotnet format pass with new editorconfig * Fix naming style issues * Apply suggestions from code review Co-authored-by: Ac_K <Acoustik666@gmail.com> * Revert one suggestion * Second dotnet format pass and fix build issues * Final pass of dotnet format * Add trailing commas * Fix formatting issues * Keep unnecessary assignment in IconColorPicker.cs * Use using declarations and extend resource lifetimes * Fix rebase issues * Adjust comment spacing * Fix typo * Fix naming issues * Apply suggestions from code review Co-authored-by: Ac_K <Acoustik666@gmail.com> * Revert unintentional change * Remove unused file * Remove static keyword from ViewModels Binding of static members doesn't work and is silently ignored. --------- Co-authored-by: Ac_K <Acoustik666@gmail.com>
94 lines
2.7 KiB
C#
94 lines
2.7 KiB
C#
using OpenTK.Graphics.OpenGL;
|
|
using Ryujinx.Common.Configuration;
|
|
using Ryujinx.Common.Logging;
|
|
using Ryujinx.Graphics.GAL;
|
|
using Ryujinx.Graphics.OpenGL;
|
|
using Ryujinx.Ui.Common.Configuration;
|
|
using SPB.Graphics;
|
|
using SPB.Graphics.Exceptions;
|
|
using SPB.Graphics.OpenGL;
|
|
using SPB.Platform;
|
|
using SPB.Platform.WGL;
|
|
using SPB.Windowing;
|
|
using System;
|
|
|
|
namespace Ryujinx.Ava.UI.Renderer
|
|
{
|
|
public class EmbeddedWindowOpenGL : EmbeddedWindow
|
|
{
|
|
private SwappableNativeWindowBase _window;
|
|
|
|
public OpenGLContextBase Context { get; set; }
|
|
|
|
protected override void OnWindowDestroying()
|
|
{
|
|
Context.Dispose();
|
|
|
|
base.OnWindowDestroying();
|
|
}
|
|
|
|
public override void OnWindowCreated()
|
|
{
|
|
base.OnWindowCreated();
|
|
|
|
if (OperatingSystem.IsWindows())
|
|
{
|
|
_window = new WGLWindow(new NativeHandle(WindowHandle));
|
|
}
|
|
else if (OperatingSystem.IsLinux())
|
|
{
|
|
_window = X11Window;
|
|
}
|
|
else
|
|
{
|
|
throw new PlatformNotSupportedException();
|
|
}
|
|
|
|
var flags = OpenGLContextFlags.Compat;
|
|
if (ConfigurationState.Instance.Logger.GraphicsDebugLevel != GraphicsDebugLevel.None)
|
|
{
|
|
flags |= OpenGLContextFlags.Debug;
|
|
}
|
|
|
|
var graphicsMode = Environment.OSVersion.Platform == PlatformID.Unix ? new FramebufferFormat(new ColorFormat(8, 8, 8, 0), 16, 0, ColorFormat.Zero, 0, 2, false) : FramebufferFormat.Default;
|
|
|
|
Context = PlatformHelper.CreateOpenGLContext(graphicsMode, 3, 3, flags);
|
|
|
|
Context.Initialize(_window);
|
|
Context.MakeCurrent(_window);
|
|
|
|
GL.LoadBindings(new OpenTKBindingsContext(Context.GetProcAddress));
|
|
|
|
Context.MakeCurrent(null);
|
|
}
|
|
|
|
public void MakeCurrent(bool unbind = false, bool shouldThrow = true)
|
|
{
|
|
try
|
|
{
|
|
Context?.MakeCurrent(!unbind ? _window : null);
|
|
}
|
|
catch (ContextException e)
|
|
{
|
|
if (shouldThrow)
|
|
{
|
|
throw;
|
|
}
|
|
|
|
Logger.Warning?.Print(LogClass.Ui, $"Failed to {(!unbind ? "bind" : "unbind")} OpenGL context: {e}");
|
|
}
|
|
}
|
|
|
|
public void SwapBuffers()
|
|
{
|
|
_window?.SwapBuffers();
|
|
}
|
|
|
|
public void InitializeBackgroundContext(IRenderer renderer)
|
|
{
|
|
(renderer as OpenGLRenderer)?.InitializeBackgroundContext(SPBOpenGLContext.CreateBackgroundContext(Context));
|
|
|
|
MakeCurrent();
|
|
}
|
|
}
|
|
}
|