From 764b2bff8b88ceb215eeeaee68a1e01936e4adb2 Mon Sep 17 00:00:00 2001 From: "H. Utku Maden" Date: Sun, 17 May 2026 21:45:58 +0300 Subject: [PATCH] Update to the latest OpenTK and BlurgText. --- .../BlurgGLExtension.cs | 26 +++++++++---------- .../Dashboard.BlurgText.OpenGL.csproj | 2 +- .../Dashboard.BlurgText.csproj | 4 +-- Dashboard.Common/Dashboard.Common.csproj | 2 +- .../Dashboard.Drawing.OpenGL.csproj | 2 +- Dashboard.Drawing/Dashboard.Drawing.csproj | 2 +- .../Dashboard.ImmediateUI.csproj | 2 +- Dashboard.OpenGL/Dashboard.OpenGL.csproj | 2 +- Dashboard.OpenGL/Drawing/ImmediateMode.cs | 22 ++++++++-------- Dashboard.OpenGL/GLTextureExtension.cs | 8 +++--- Dashboard.OpenTK/Dashboard.OpenTK.csproj | 2 +- Dashboard.OpenTK/PAL2/Pal2Application.cs | 15 ++++++----- Dashboard.StbImage/Dashboard.StbImage.csproj | 2 +- Dashboard/Dashboard.csproj | 2 +- .../Dashboard.TestApplication.csproj | 2 +- 15 files changed, 48 insertions(+), 47 deletions(-) diff --git a/Dashboard.BlurgText.OpenGL/BlurgGLExtension.cs b/Dashboard.BlurgText.OpenGL/BlurgGLExtension.cs index 227cdc1..524074c 100644 --- a/Dashboard.BlurgText.OpenGL/BlurgGLExtension.cs +++ b/Dashboard.BlurgText.OpenGL/BlurgGLExtension.cs @@ -74,9 +74,9 @@ namespace Dashboard.BlurgText.OpenGL private void UpdateTexture(IntPtr texture, IntPtr buffer, int x, int y, int width, int height) { - GL.BindTexture(TextureTarget.Texture2d, (int)texture); - GL.TexSubImage2D(TextureTarget.Texture2d, 0, x, y, width, height, OPENGL.PixelFormat.Rgba, PixelType.UnsignedByte, buffer); - // GL.TexSubImage2D(TextureTarget.Texture2d, 0, x, y, width, height, OPENGL.PixelFormat.Red, PixelType.Byte, buffer); + GL.BindTexture(TextureTarget.Texture2D, (int)texture); + GL.TexSubImage2D(TextureTarget.Texture2D, 0, x, y, width, height, OPENGL.PixelFormat.Rgba, PixelType.UnsignedByte, buffer); + // GL.TexSubImage2D(TextureTarget.Texture2D, 0, x, y, width, height, OPENGL.PixelFormat.Red, PixelType.Byte, buffer); } @@ -84,16 +84,16 @@ namespace Dashboard.BlurgText.OpenGL { int texture = GL.GenTexture(); - GL.BindTexture(TextureTarget.Texture2d, texture); - GL.TexImage2D(TextureTarget.Texture2d, 0, InternalFormat.Rgba, width, height, 0, OPENGL.PixelFormat.Rgba, PixelType.UnsignedByte, IntPtr.Zero); - // GL.TexImage2D(TextureTarget.Texture2d, 0, InternalFormat.R8, width, height, 0, OPENGL.PixelFormat.Red, PixelType.Byte, IntPtr.Zero); + GL.BindTexture(TextureTarget.Texture2D, texture); + GL.TexImage2D(TextureTarget.Texture2D, 0, InternalFormat.Rgba, width, height, 0, OPENGL.PixelFormat.Rgba, PixelType.UnsignedByte, IntPtr.Zero); + // GL.TexImage2D(TextureTarget.Texture2D, 0, InternalFormat.R8, width, height, 0, OPENGL.PixelFormat.Red, PixelType.Byte, IntPtr.Zero); - GL.TexParameteri(TextureTarget.Texture2d, TextureParameterName.TextureMinFilter, (int)TextureMinFilter.Linear); - GL.TexParameteri(TextureTarget.Texture2d, TextureParameterName.TextureMagFilter, (int)TextureMagFilter.Linear); - // GL.TexParameteri(TextureTarget.Texture2d, TextureParameterName.TextureSwizzleR, (int)TextureSwizzle.One); - // GL.TexParameteri(TextureTarget.Texture2d, TextureParameterName.TextureSwizzleG, (int)TextureSwizzle.One); - // GL.TexParameteri(TextureTarget.Texture2d, TextureParameterName.TextureSwizzleB, (int)TextureSwizzle.One); - // GL.TexParameteri(TextureTarget.Texture2d, TextureParameterName.TextureSwizzleA, (int)TextureSwizzle.Red); + GL.TexParameteri(TextureTarget.Texture2D, TextureParameterName.TextureMinFilter, (int)TextureMinFilter.Linear); + GL.TexParameteri(TextureTarget.Texture2D, TextureParameterName.TextureMagFilter, (int)TextureMagFilter.Linear); + // GL.TexParameteri(TextureTarget.Texture2D, TextureParameterName.TextureSwizzleR, (int)TextureSwizzle.One); + // GL.TexParameteri(TextureTarget.Texture2D, TextureParameterName.TextureSwizzleG, (int)TextureSwizzle.One); + // GL.TexParameteri(TextureTarget.Texture2D, TextureParameterName.TextureSwizzleB, (int)TextureSwizzle.One); + // GL.TexParameteri(TextureTarget.Texture2D, TextureParameterName.TextureSwizzleA, (int)TextureSwizzle.Red); _textures.Add(texture); @@ -191,7 +191,7 @@ namespace Dashboard.BlurgText.OpenGL foreach (DrawCall call in drawCalls) { - GL.BindTexture(TextureTarget.Texture2d, call.Texture); + GL.BindTexture(TextureTarget.Texture2D, call.Texture); GL.Uniform4f(_fillColorLocation, call.FillColor.X, call.FillColor.Y, call.FillColor.Z, call.FillColor.W); GL.DrawElements(PrimitiveType.Triangles, call.Count, DrawElementsType.UnsignedShort, call.Offset); diff --git a/Dashboard.BlurgText.OpenGL/Dashboard.BlurgText.OpenGL.csproj b/Dashboard.BlurgText.OpenGL/Dashboard.BlurgText.OpenGL.csproj index 7ff5950..f249613 100644 --- a/Dashboard.BlurgText.OpenGL/Dashboard.BlurgText.OpenGL.csproj +++ b/Dashboard.BlurgText.OpenGL/Dashboard.BlurgText.OpenGL.csproj @@ -1,7 +1,7 @@  - net8.0 + net10.0 latest enable enable diff --git a/Dashboard.BlurgText/Dashboard.BlurgText.csproj b/Dashboard.BlurgText/Dashboard.BlurgText.csproj index b415f40..7846d85 100644 --- a/Dashboard.BlurgText/Dashboard.BlurgText.csproj +++ b/Dashboard.BlurgText/Dashboard.BlurgText.csproj @@ -1,14 +1,14 @@  - net8.0 + net10.0 latest enable enable - + diff --git a/Dashboard.Common/Dashboard.Common.csproj b/Dashboard.Common/Dashboard.Common.csproj index d6651bf..2af8be8 100644 --- a/Dashboard.Common/Dashboard.Common.csproj +++ b/Dashboard.Common/Dashboard.Common.csproj @@ -1,7 +1,7 @@  - net8.0 + net10.0 enable enable Dashboard diff --git a/Dashboard.Drawing.OpenGL/Dashboard.Drawing.OpenGL.csproj b/Dashboard.Drawing.OpenGL/Dashboard.Drawing.OpenGL.csproj index 9dd7d8d..824110c 100644 --- a/Dashboard.Drawing.OpenGL/Dashboard.Drawing.OpenGL.csproj +++ b/Dashboard.Drawing.OpenGL/Dashboard.Drawing.OpenGL.csproj @@ -1,7 +1,7 @@  - net8.0 + net10.0 enable enable true diff --git a/Dashboard.Drawing/Dashboard.Drawing.csproj b/Dashboard.Drawing/Dashboard.Drawing.csproj index 6a4d54a..20f3f39 100644 --- a/Dashboard.Drawing/Dashboard.Drawing.csproj +++ b/Dashboard.Drawing/Dashboard.Drawing.csproj @@ -1,7 +1,7 @@  - net8.0 + net10.0 disable enable diff --git a/Dashboard.ImmediateUI/Dashboard.ImmediateUI.csproj b/Dashboard.ImmediateUI/Dashboard.ImmediateUI.csproj index 997e50b..af00df2 100644 --- a/Dashboard.ImmediateUI/Dashboard.ImmediateUI.csproj +++ b/Dashboard.ImmediateUI/Dashboard.ImmediateUI.csproj @@ -1,7 +1,7 @@  - net8.0 + net10.0 disable enable diff --git a/Dashboard.OpenGL/Dashboard.OpenGL.csproj b/Dashboard.OpenGL/Dashboard.OpenGL.csproj index b4b7440..c854dfb 100644 --- a/Dashboard.OpenGL/Dashboard.OpenGL.csproj +++ b/Dashboard.OpenGL/Dashboard.OpenGL.csproj @@ -1,7 +1,7 @@  - net8.0 + net10.0 enable enable true diff --git a/Dashboard.OpenGL/Drawing/ImmediateMode.cs b/Dashboard.OpenGL/Drawing/ImmediateMode.cs index cd3516a..da2c246 100644 --- a/Dashboard.OpenGL/Drawing/ImmediateMode.cs +++ b/Dashboard.OpenGL/Drawing/ImmediateMode.cs @@ -67,14 +67,14 @@ namespace Dashboard.OpenGL.Drawing _program_image = GL.GetUniformLocation(_program, "image"); GL.GenTexture(out _white); - GL.BindTexture(TextureTarget.Texture2d, _white); - GL.TexImage2D(TextureTarget.Texture2d, 0, InternalFormat.Rgb, 1, 1, 0, OpenTK.Graphics.OpenGL.PixelFormat.Rgb, PixelType.Byte, IntPtr.Zero); - GL.TexParameteri(TextureTarget.Texture2d, TextureParameterName.TextureSwizzleA, (int)All.One); - GL.TexParameteri(TextureTarget.Texture2d, TextureParameterName.TextureSwizzleR, (int)All.One); - GL.TexParameteri(TextureTarget.Texture2d, TextureParameterName.TextureSwizzleG, (int)All.One); - GL.TexParameteri(TextureTarget.Texture2d, TextureParameterName.TextureSwizzleB, (int)All.One); - GL.TexParameteri(TextureTarget.Texture2d, TextureParameterName.TextureMinFilter, (int)TextureMinFilter.Nearest); - GL.TexParameteri(TextureTarget.Texture2d, TextureParameterName.TextureMagFilter, (int)TextureMagFilter.Nearest); + GL.BindTexture(TextureTarget.Texture2D, _white); + GL.TexImage2D(TextureTarget.Texture2D, 0, InternalFormat.Rgb, 1, 1, 0, OpenTK.Graphics.OpenGL.PixelFormat.Rgb, PixelType.Byte, IntPtr.Zero); + GL.TexParameteri(TextureTarget.Texture2D, TextureParameterName.TextureSwizzleA, (int)All.One); + GL.TexParameteri(TextureTarget.Texture2D, TextureParameterName.TextureSwizzleR, (int)All.One); + GL.TexParameteri(TextureTarget.Texture2D, TextureParameterName.TextureSwizzleG, (int)All.One); + GL.TexParameteri(TextureTarget.Texture2D, TextureParameterName.TextureSwizzleB, (int)All.One); + GL.TexParameteri(TextureTarget.Texture2D, TextureParameterName.TextureMinFilter, (int)TextureMinFilter.Nearest); + GL.TexParameteri(TextureTarget.Texture2D, TextureParameterName.TextureMagFilter, (int)TextureMagFilter.Nearest); GL.GenVertexArray(out _vao); } @@ -116,7 +116,7 @@ namespace Dashboard.OpenGL.Drawing GL.UseProgram(_program); GL.ActiveTexture(TextureUnit.Texture0); - GL.BindTexture(TextureTarget.Texture2d, _white); + GL.BindTexture(TextureTarget.Texture2D, _white); GL.UniformMatrix4f(_program_transforms, 1, true, ref view); GL.Uniform1i(_program_image, 0); @@ -155,7 +155,7 @@ namespace Dashboard.OpenGL.Drawing GL.UseProgram(_program); GL.ActiveTexture(TextureUnit.Texture0); - GL.BindTexture(TextureTarget.Texture2d, _white); + GL.BindTexture(TextureTarget.Texture2D, _white); GL.UniformMatrix4f(_program_transforms, 1, true, ref view); GL.Uniform1i(_program_image, 0); @@ -207,7 +207,7 @@ namespace Dashboard.OpenGL.Drawing GL.UseProgram(_program); GL.ActiveTexture(TextureUnit.Texture0); - GL.BindTexture(TextureTarget.Texture2d, ((GLTexture)texture).Handle); + GL.BindTexture(TextureTarget.Texture2D, ((GLTexture)texture).Handle); GL.UniformMatrix4f(_program_transforms, 1, true, ref view); GL.Uniform1i(_program_image, 0); diff --git a/Dashboard.OpenGL/GLTextureExtension.cs b/Dashboard.OpenGL/GLTextureExtension.cs index 4e42dba..4ead9ad 100644 --- a/Dashboard.OpenGL/GLTextureExtension.cs +++ b/Dashboard.OpenGL/GLTextureExtension.cs @@ -79,10 +79,10 @@ namespace Dashboard.OpenGL private TextureTarget Target { get; } = type switch { - TextureType.Texture1D => TextureTarget.Texture1d, - TextureType.Texture2D => TextureTarget.Texture2d, - TextureType.Texture3D => TextureTarget.Texture3d, - TextureType.Texture2DArray => TextureTarget.Texture2dArray, + TextureType.Texture1D => TextureTarget.Texture1D, + TextureType.Texture2D => TextureTarget.Texture2D, + TextureType.Texture3D => TextureTarget.Texture3D, + TextureType.Texture2DArray => TextureTarget.Texture2DArray, TextureType.Texture2DCube => TextureTarget.TextureCubeMap, _ => throw new NotSupportedException() }; diff --git a/Dashboard.OpenTK/Dashboard.OpenTK.csproj b/Dashboard.OpenTK/Dashboard.OpenTK.csproj index 65c3e14..063ca97 100644 --- a/Dashboard.OpenTK/Dashboard.OpenTK.csproj +++ b/Dashboard.OpenTK/Dashboard.OpenTK.csproj @@ -1,7 +1,7 @@  - net8.0 + net10.0 enable enable diff --git a/Dashboard.OpenTK/PAL2/Pal2Application.cs b/Dashboard.OpenTK/PAL2/Pal2Application.cs index 90f8b41..6a87ec2 100644 --- a/Dashboard.OpenTK/PAL2/Pal2Application.cs +++ b/Dashboard.OpenTK/PAL2/Pal2Application.cs @@ -49,7 +49,7 @@ namespace Dashboard.OpenTK.PAL2 TK.Window.PostUserEvent(new ApplicationQuitEventArgs()); }); - EventQueue.EventRaised += OnEventRaised; + Toolkit.Event.EventRaised += OnEventRaised; Toolkit.Init(options ?? new ToolkitOptions()); } @@ -93,11 +93,11 @@ namespace Dashboard.OpenTK.PAL2 } } - private void OnEventRaised(PalHandle? handle, PlatformEventType type, EventArgs args) + private void OnEventRaised(EventArgs args) { - if (handle is WindowHandle window) + if (args is WindowEventArgs window) { - OnWindowEventRaised(window, type, args); + OnWindowEventRaised(window.Window, window); return; } else @@ -106,7 +106,7 @@ namespace Dashboard.OpenTK.PAL2 } } - private void OnWindowEventRaised(WindowHandle handle, PlatformEventType type, EventArgs args) + private void OnWindowEventRaised(WindowHandle handle, EventArgs args) { if (!_windowHandleWindowMap.TryGetValue(handle, out WindowExtraInfo? info)) { @@ -114,7 +114,8 @@ namespace Dashboard.OpenTK.PAL2 return; } - switch (type) + // TODO: fix this. + switch (PlatformEventType.UserMessage) { case PlatformEventType.UserMessage: if (args is ApplicationQuitEventArgs) @@ -228,7 +229,7 @@ namespace Dashboard.OpenTK.PAL2 } default: - Debugger?.LogDebug($"Unknown event type {type} with \"{args}\"."); + Debugger?.LogDebug($"Unknown event type {args.GetType().Name} with \"{args}\"."); break; } } diff --git a/Dashboard.StbImage/Dashboard.StbImage.csproj b/Dashboard.StbImage/Dashboard.StbImage.csproj index 76eec2e..3cb98a3 100644 --- a/Dashboard.StbImage/Dashboard.StbImage.csproj +++ b/Dashboard.StbImage/Dashboard.StbImage.csproj @@ -1,7 +1,7 @@  - net8.0 + net10.0 latest enable enable diff --git a/Dashboard/Dashboard.csproj b/Dashboard/Dashboard.csproj index a44e056..86d1169 100644 --- a/Dashboard/Dashboard.csproj +++ b/Dashboard/Dashboard.csproj @@ -1,7 +1,7 @@  - net8.0 + net10.0 disable enable diff --git a/tests/Dashboard.TestApplication/Dashboard.TestApplication.csproj b/tests/Dashboard.TestApplication/Dashboard.TestApplication.csproj index f3f598e..a2d3ffd 100644 --- a/tests/Dashboard.TestApplication/Dashboard.TestApplication.csproj +++ b/tests/Dashboard.TestApplication/Dashboard.TestApplication.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net10.0 enable enable