From 10a09dad7b1099b2e6e8f6494dbdfcbe96a0a97a Mon Sep 17 00:00:00 2001 From: Martin Date: Thu, 18 Jul 2024 11:31:56 +0200 Subject: [PATCH] [GLFW] Remove unused WindowConfig.opengl --- .../Application.fs | 3 - .../Application.fs | 3 - .../Aardvark.Application.Slim/GLFW.fs | 62 ++++++++++++------- 3 files changed, 40 insertions(+), 28 deletions(-) diff --git a/src/Application/Aardvark.Application.Slim.GL/Application.fs b/src/Application/Aardvark.Application.Slim.GL/Application.fs index c76e593b..d07266d1 100644 --- a/src/Application/Aardvark.Application.Slim.GL/Application.fs +++ b/src/Application/Aardvark.Application.Slim.GL/Application.fs @@ -486,9 +486,6 @@ type OpenGlApplication private (runtime : Runtime, shaderCachePath : Option IRuntime diff --git a/src/Application/Aardvark.Application.Slim.Vulkan/Application.fs b/src/Application/Aardvark.Application.Slim.Vulkan/Application.fs index 56836181..d198376e 100644 --- a/src/Application/Aardvark.Application.Slim.Vulkan/Application.fs +++ b/src/Application/Aardvark.Application.Slim.Vulkan/Application.fs @@ -155,9 +155,6 @@ type VulkanApplication private (app : HeadlessVulkanApplication, hideCocoaMenuBa override x.Destroy() = app.Dispose() - override x.CreateGameWindow(config : WindowConfig) = - base.CreateGameWindow { config with opengl = false } - interface IApplication with member x.Initialize(ctrl : IRenderControl, samples : int) = x.Initialize(ctrl, samples) member x.Runtime = x.Runtime :> IRuntime \ No newline at end of file diff --git a/src/Application/Aardvark.Application.Slim/GLFW.fs b/src/Application/Aardvark.Application.Slim/GLFW.fs index db822699..7eb25833 100644 --- a/src/Application/Aardvark.Application.Slim/GLFW.fs +++ b/src/Application/Aardvark.Application.Slim/GLFW.fs @@ -359,31 +359,49 @@ type WindowState = type WindowConfig = { - title : string - width : int - height : int - focus : bool - resizable : bool - vsync : bool - transparent : bool - opengl : bool + /// Title of the window. + title : string + + /// Width of the window content. + width : int + + /// Height of the window content. + height : int + + /// Desired sample count for the framebuffer. + samples : int + + /// Specifies whether the window will be focused when created. + focus : bool + + /// Specifies whether the window should be resizable. + resizable : bool + + /// Specifies whether v-sync should be enabled. + vsync : bool + + /// Specifies whether the framebuffer should be transparent and composited with + /// the background of the window. + transparent : bool + + /// Specifies whether to use full resolution framebuffers on Retina displays. physicalSize : bool - samples : int - stereo : bool + + /// Specifies whether to use OpenGL stereoscopic rendering. + stereo : bool } - static member Default = - { WindowConfig.title = "Aardvark rocks \\o/" - WindowConfig.width = 1024 - WindowConfig.height = 768 - WindowConfig.resizable = true - WindowConfig.focus = true - WindowConfig.vsync = true - WindowConfig.opengl = true - WindowConfig.physicalSize = false - WindowConfig.transparent = false - WindowConfig.samples = 1 - WindowConfig.stereo = false } + static member Default : WindowConfig = + { title = "Aardvark rocks \\o/" + width = 1024 + height = 768 + samples = 1 + resizable = true + focus = true + vsync = true + physicalSize = false + transparent = false + stereo = false } module internal IconLoader = open System.IO