aboutsummaryrefslogtreecommitdiff
path: root/Ryujinx.Graphics.OpenGL
diff options
context:
space:
mode:
Diffstat (limited to 'Ryujinx.Graphics.OpenGL')
-rw-r--r--Ryujinx.Graphics.OpenGL/BackgroundContextWorker.cs29
-rw-r--r--Ryujinx.Graphics.OpenGL/Helper/GLXHelper.cs36
-rw-r--r--Ryujinx.Graphics.OpenGL/Helper/WGLHelper.cs15
-rw-r--r--Ryujinx.Graphics.OpenGL/IOpenGLContext.cs27
-rw-r--r--Ryujinx.Graphics.OpenGL/Renderer.cs4
-rw-r--r--Ryujinx.Graphics.OpenGL/Ryujinx.Graphics.OpenGL.csproj2
-rw-r--r--Ryujinx.Graphics.OpenGL/Window.cs4
7 files changed, 92 insertions, 25 deletions
diff --git a/Ryujinx.Graphics.OpenGL/BackgroundContextWorker.cs b/Ryujinx.Graphics.OpenGL/BackgroundContextWorker.cs
index d56951a7..f942037c 100644
--- a/Ryujinx.Graphics.OpenGL/BackgroundContextWorker.cs
+++ b/Ryujinx.Graphics.OpenGL/BackgroundContextWorker.cs
@@ -1,37 +1,24 @@
-using OpenTK;
-using OpenTK.Graphics;
-using Ryujinx.Common;
+using Ryujinx.Common;
using System;
using System.Collections.Generic;
using System.Threading;
namespace Ryujinx.Graphics.OpenGL
{
- class BackgroundContextWorker : IDisposable
+ unsafe class BackgroundContextWorker : IDisposable
{
[ThreadStatic]
public static bool InBackground;
-
- private GameWindow _window;
- private GraphicsContext _context;
private Thread _thread;
private bool _running;
private AutoResetEvent _signal;
private Queue<Action> _work;
private ObjectPool<ManualResetEventSlim> _invokePool;
+ private readonly IOpenGLContext _backgroundContext;
- public BackgroundContextWorker(IGraphicsContext baseContext)
+ public BackgroundContextWorker(IOpenGLContext backgroundContext)
{
- _window = new GameWindow(
- 100, 100, GraphicsMode.Default,
- "Background Window", OpenTK.GameWindowFlags.FixedWindow, OpenTK.DisplayDevice.Default,
- 3, 3, GraphicsContextFlags.ForwardCompatible, baseContext, false);
-
- _window.Visible = false;
- _context = (GraphicsContext)_window.Context;
- _context.MakeCurrent(null);
-
_running = true;
_signal = new AutoResetEvent(false);
@@ -40,12 +27,14 @@ namespace Ryujinx.Graphics.OpenGL
_thread = new Thread(Run);
_thread.Start();
+ _backgroundContext = backgroundContext;
}
private void Run()
{
InBackground = true;
- _context.MakeCurrent(_window.WindowInfo);
+
+ _backgroundContext.MakeCurrent();
while (_running)
{
@@ -66,7 +55,7 @@ namespace Ryujinx.Graphics.OpenGL
}
}
- _window.Dispose();
+ _backgroundContext.Dispose();
}
public void Invoke(Action action)
@@ -99,4 +88,4 @@ namespace Ryujinx.Graphics.OpenGL
_signal.Dispose();
}
}
-}
+} \ No newline at end of file
diff --git a/Ryujinx.Graphics.OpenGL/Helper/GLXHelper.cs b/Ryujinx.Graphics.OpenGL/Helper/GLXHelper.cs
new file mode 100644
index 00000000..7cc39708
--- /dev/null
+++ b/Ryujinx.Graphics.OpenGL/Helper/GLXHelper.cs
@@ -0,0 +1,36 @@
+using System;
+using System.Runtime.InteropServices;
+using System.Runtime.Versioning;
+
+namespace Ryujinx.Graphics.OpenGL.Helper
+{
+ [SupportedOSPlatform("linux")]
+ internal static class GLXHelper
+ {
+ private const string LibraryName = "glx.dll";
+
+ static GLXHelper()
+ {
+ NativeLibrary.SetDllImportResolver(typeof(GLXHelper).Assembly, (name, assembly, path) =>
+ {
+ if (name != LibraryName)
+ {
+ return IntPtr.Zero;
+ }
+
+ if (!NativeLibrary.TryLoad("libGL.so.1", assembly, path, out IntPtr result))
+ {
+ if (!NativeLibrary.TryLoad("libGL.so", assembly, path, out result))
+ {
+ return IntPtr.Zero;
+ }
+ }
+
+ return result;
+ });
+ }
+
+ [DllImport(LibraryName, EntryPoint = "glXGetCurrentContext")]
+ public static extern IntPtr GetCurrentContext();
+ }
+}
diff --git a/Ryujinx.Graphics.OpenGL/Helper/WGLHelper.cs b/Ryujinx.Graphics.OpenGL/Helper/WGLHelper.cs
new file mode 100644
index 00000000..b37134eb
--- /dev/null
+++ b/Ryujinx.Graphics.OpenGL/Helper/WGLHelper.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Runtime.InteropServices;
+using System.Runtime.Versioning;
+
+namespace Ryujinx.Graphics.OpenGL.Helper
+{
+ [SupportedOSPlatform("windows")]
+ internal static class WGLHelper
+ {
+ private const string LibraryName = "OPENGL32.DLL";
+
+ [DllImport(LibraryName, EntryPoint = "wglGetCurrentContext")]
+ public extern static IntPtr GetCurrentContext();
+ }
+}
diff --git a/Ryujinx.Graphics.OpenGL/IOpenGLContext.cs b/Ryujinx.Graphics.OpenGL/IOpenGLContext.cs
new file mode 100644
index 00000000..b1f6d72d
--- /dev/null
+++ b/Ryujinx.Graphics.OpenGL/IOpenGLContext.cs
@@ -0,0 +1,27 @@
+using Ryujinx.Graphics.OpenGL.Helper;
+using System;
+
+namespace Ryujinx.Graphics.OpenGL
+{
+ public interface IOpenGLContext : IDisposable
+ {
+ void MakeCurrent();
+
+ // TODO: Support more APIs per platform.
+ static bool HasContext()
+ {
+ if (OperatingSystem.IsWindows())
+ {
+ return WGLHelper.GetCurrentContext() != IntPtr.Zero;
+ }
+ else if (OperatingSystem.IsLinux())
+ {
+ return GLXHelper.GetCurrentContext() != IntPtr.Zero;
+ }
+ else
+ {
+ return false;
+ }
+ }
+ }
+}
diff --git a/Ryujinx.Graphics.OpenGL/Renderer.cs b/Ryujinx.Graphics.OpenGL/Renderer.cs
index c3d08309..cc8fa195 100644
--- a/Ryujinx.Graphics.OpenGL/Renderer.cs
+++ b/Ryujinx.Graphics.OpenGL/Renderer.cs
@@ -149,7 +149,7 @@ namespace Ryujinx.Graphics.OpenGL
public void BackgroundContextAction(Action action)
{
- if (GraphicsContext.CurrentContext != null)
+ if (IOpenGLContext.HasContext())
{
action(); // We have a context already - use that (assuming it is the main one).
}
@@ -159,7 +159,7 @@ namespace Ryujinx.Graphics.OpenGL
}
}
- public void InitializeBackgroundContext(IGraphicsContext baseContext)
+ public void InitializeBackgroundContext(IOpenGLContext baseContext)
{
_window.InitializeBackgroundContext(baseContext);
}
diff --git a/Ryujinx.Graphics.OpenGL/Ryujinx.Graphics.OpenGL.csproj b/Ryujinx.Graphics.OpenGL/Ryujinx.Graphics.OpenGL.csproj
index 5d28b4f3..aff59d97 100644
--- a/Ryujinx.Graphics.OpenGL/Ryujinx.Graphics.OpenGL.csproj
+++ b/Ryujinx.Graphics.OpenGL/Ryujinx.Graphics.OpenGL.csproj
@@ -6,7 +6,7 @@
</PropertyGroup>
<ItemGroup>
- <PackageReference Include="OpenTK.NetStandard" Version="1.0.5.32" />
+ <PackageReference Include="OpenTK.Graphics" Version="4.5.0" />
</ItemGroup>
<ItemGroup>
diff --git a/Ryujinx.Graphics.OpenGL/Window.cs b/Ryujinx.Graphics.OpenGL/Window.cs
index 80149bf7..5de2a645 100644
--- a/Ryujinx.Graphics.OpenGL/Window.cs
+++ b/Ryujinx.Graphics.OpenGL/Window.cs
@@ -125,7 +125,7 @@ namespace Ryujinx.Graphics.OpenGL
// Remove Alpha channel
GL.ColorMask(drawFramebuffer, false, false, false, true);
- GL.ClearBuffer(ClearBuffer.Color, 0, new float[] { 0.0f, 0.0f, 0.0f, 1.0f });
+ GL.ClearBuffer(ClearBuffer.Color, drawFramebuffer, new float[] { 0.0f, 0.0f, 0.0f, 1.0f });
GL.ColorMask(drawFramebuffer,
oldFramebufferColorWritemask[0],
oldFramebufferColorWritemask[1],
@@ -158,7 +158,7 @@ namespace Ryujinx.Graphics.OpenGL
return handle;
}
- public void InitializeBackgroundContext(IGraphicsContext baseContext)
+ public void InitializeBackgroundContext(IOpenGLContext baseContext)
{
BackgroundContext = new BackgroundContextWorker(baseContext);
}
generated by cgit v1.2.3 (git 2.39.1) at 2026-07-14 03:23:14 +0000