From 1538c978aa4f54a55ed7c98e6f4d247fc1d1ba08 Mon Sep 17 00:00:00 2001 From: ReinUsesLisp Date: Mon, 30 Jul 2018 04:09:11 -0300 Subject: [PATCH] Some function renames and metadata changes --- src/OpenTK/Configuration.cs | 7 ++---- src/OpenTK/Graphics/Vulkan/UnsafeEx.cs | 13 ---------- .../Vulkan/{NativeList.cs => VulkanList.cs} | 25 +++++++++++-------- .../{NativeString.cs => VulkanString.cs} | 12 ++++----- src/OpenTK/Graphics/Vulkan/VulkanStrings.cs | 16 ++++++------ src/OpenTK/OpenTK.Standard.csproj | 12 ++++----- 6 files changed, 37 insertions(+), 48 deletions(-) delete mode 100644 src/OpenTK/Graphics/Vulkan/UnsafeEx.cs rename src/OpenTK/Graphics/Vulkan/{NativeList.cs => VulkanList.cs} (95%) rename src/OpenTK/Graphics/Vulkan/{NativeString.cs => VulkanString.cs} (77%) diff --git a/src/OpenTK/Configuration.cs b/src/OpenTK/Configuration.cs index 09f643f7..c3850cf7 100644 --- a/src/OpenTK/Configuration.cs +++ b/src/OpenTK/Configuration.cs @@ -164,9 +164,9 @@ namespace OpenTK return t != null; } -#if SDL2 private static bool DetectSdl2() { +#if SDL2 bool supported = false; // Detect whether SDL2 is supported @@ -220,13 +220,10 @@ namespace OpenTK } return supported; - } #else - private static bool DetectSdl2() - { return false; - } #endif + } private static void DetectUnix(out bool unix, out bool linux, out bool macos) { diff --git a/src/OpenTK/Graphics/Vulkan/UnsafeEx.cs b/src/OpenTK/Graphics/Vulkan/UnsafeEx.cs deleted file mode 100644 index 949c3ce7..00000000 --- a/src/OpenTK/Graphics/Vulkan/UnsafeEx.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; -using System.Runtime.CompilerServices; - -namespace OpenTK.Graphics.Vulkan -{ - public static unsafe class UnsafeEx - { - public static IntPtr AsIntPtr(ref T obj) - { - return new IntPtr(Unsafe.AsPointer(ref obj)); - } - } -} diff --git a/src/OpenTK/Graphics/Vulkan/NativeList.cs b/src/OpenTK/Graphics/Vulkan/VulkanList.cs similarity index 95% rename from src/OpenTK/Graphics/Vulkan/NativeList.cs rename to src/OpenTK/Graphics/Vulkan/VulkanList.cs index aaa8a6c9..df712912 100644 --- a/src/OpenTK/Graphics/Vulkan/NativeList.cs +++ b/src/OpenTK/Graphics/Vulkan/VulkanList.cs @@ -11,7 +11,7 @@ namespace OpenTK.Graphics.Vulkan { using Debug = System.Diagnostics.Debug; - public unsafe class NativeList : IEnumerable, IDisposable where T : struct + public unsafe class VulkanList : IEnumerable, IDisposable where T : struct { private byte* _dataPtr; private uint _elementCapacity; @@ -21,24 +21,29 @@ namespace OpenTK.Graphics.Vulkan private const float GrowthFactor = 2f; private static readonly uint s_elementByteSize = InitializeTypeSize(); - public NativeList() : this(DefaultCapacity) { } - public NativeList(uint capacity) + public VulkanList() : this(DefaultCapacity) { } + public VulkanList(uint capacity) { Allocate(capacity); } - public NativeList(uint capacity, uint count) + public VulkanList(uint capacity, uint count) { Allocate(capacity); Count = count; } - public NativeList(NativeList existingList) + public VulkanList(VulkanList existingList) { Allocate(existingList._elementCapacity); Unsafe.CopyBlock(_dataPtr, existingList._dataPtr, existingList._count * s_elementByteSize); } + public static VulkanList New(uint count) + { + return new VulkanList(count, count); + } + public IntPtr Data { get @@ -386,14 +391,14 @@ namespace OpenTK.Graphics.Vulkan public struct View : IEnumerable where ViewType : struct { private static readonly uint s_elementByteSize = (uint)Unsafe.SizeOf(); - private readonly NativeList _parent; + private readonly VulkanList _parent; - public View(NativeList parent) + public View(VulkanList parent) { _parent = parent; } - public uint Count => (_parent.Count * NativeList.s_elementByteSize) / s_elementByteSize; + public uint Count => (_parent.Count * VulkanList.s_elementByteSize) / s_elementByteSize; public ViewType this[uint index] { @@ -458,11 +463,11 @@ namespace OpenTK.Graphics.Vulkan public struct ReadOnlyNativeListView : IEnumerable where T : struct { - private readonly NativeList _list; + private readonly VulkanList _list; private readonly uint _start; public readonly uint Count; - public ReadOnlyNativeListView(NativeList list, uint start, uint count) + public ReadOnlyNativeListView(VulkanList list, uint start, uint count) { _list = list; _start = start; diff --git a/src/OpenTK/Graphics/Vulkan/NativeString.cs b/src/OpenTK/Graphics/Vulkan/VulkanString.cs similarity index 77% rename from src/OpenTK/Graphics/Vulkan/NativeString.cs rename to src/OpenTK/Graphics/Vulkan/VulkanString.cs index 394da3a2..0ed13f50 100644 --- a/src/OpenTK/Graphics/Vulkan/NativeString.cs +++ b/src/OpenTK/Graphics/Vulkan/VulkanString.cs @@ -4,14 +4,14 @@ using System.Text; namespace OpenTK.Graphics.Vulkan { - public unsafe class NativeString : IDisposable + public unsafe class VulkanString : IDisposable { private GCHandle _handle; private uint _numBytes; public byte* StringPtr => (byte*)_handle.AddrOfPinnedObject().ToPointer(); - public NativeString(string s) + public VulkanString(string s) { if (s == null) { @@ -46,9 +46,9 @@ namespace OpenTK.Graphics.Vulkan _handle.Free(); } - public static implicit operator byte* (NativeString utf8String) => utf8String.StringPtr; - public static implicit operator IntPtr (NativeString utf8String) => new IntPtr(utf8String.StringPtr); - public static implicit operator NativeString(string s) => new NativeString(s); - public static implicit operator string(NativeString utf8String) => utf8String.GetString(); + public static implicit operator byte* (VulkanString utf8String) => utf8String.StringPtr; + public static implicit operator IntPtr (VulkanString utf8String) => new IntPtr(utf8String.StringPtr); + public static implicit operator VulkanString(string s) => new VulkanString(s); + public static implicit operator string(VulkanString utf8String) => utf8String.GetString(); } } \ No newline at end of file diff --git a/src/OpenTK/Graphics/Vulkan/VulkanStrings.cs b/src/OpenTK/Graphics/Vulkan/VulkanStrings.cs index 267263ed..9e19e029 100644 --- a/src/OpenTK/Graphics/Vulkan/VulkanStrings.cs +++ b/src/OpenTK/Graphics/Vulkan/VulkanStrings.cs @@ -2,13 +2,13 @@ { public static class VulkanStrings { - public static NativeString VK_KHR_SURFACE_EXTENSION_NAME = "VK_KHR_surface"; - public static NativeString VK_KHR_WIN32_SURFACE_EXTENSION_NAME = "VK_KHR_win32_surface"; - public static NativeString VK_KHR_XCB_SURFACE_EXTENSION_NAME = "VK_KHR_xcb_surface"; - public static NativeString VK_KHR_XLIB_SURFACE_EXTENSION_NAME = "VK_KHR_xlib_surface"; - public static NativeString VK_KHR_SWAPCHAIN_EXTENSION_NAME = "VK_KHR_swapchain"; - public static NativeString VK_EXT_DEBUG_REPORT_EXTENSION_NAME = "VK_EXT_debug_report"; - public static NativeString StandardValidationLayerName = "VK_LAYER_LUNARG_standard_validation"; - public static NativeString main = "main"; + public static VulkanString VK_KHR_SURFACE_EXTENSION_NAME = "VK_KHR_surface"; + public static VulkanString VK_KHR_WIN32_SURFACE_EXTENSION_NAME = "VK_KHR_win32_surface"; + public static VulkanString VK_KHR_XCB_SURFACE_EXTENSION_NAME = "VK_KHR_xcb_surface"; + public static VulkanString VK_KHR_XLIB_SURFACE_EXTENSION_NAME = "VK_KHR_xlib_surface"; + public static VulkanString VK_KHR_SWAPCHAIN_EXTENSION_NAME = "VK_KHR_swapchain"; + public static VulkanString VK_EXT_DEBUG_REPORT_EXTENSION_NAME = "VK_EXT_debug_report"; + public static VulkanString StandardValidationLayerName = "VK_LAYER_LUNARG_standard_validation"; + public static VulkanString main = "main"; } } diff --git a/src/OpenTK/OpenTK.Standard.csproj b/src/OpenTK/OpenTK.Standard.csproj index 3dfe6c5b..6101cb7e 100644 --- a/src/OpenTK/OpenTK.Standard.csproj +++ b/src/OpenTK/OpenTK.Standard.csproj @@ -68,24 +68,24 @@ true - 1.1.7 + 1.0.5 The Open Toolkit library (OpenTK) is an advanced, low-level C# wrapper for OpenGL, OpenGL ES, OpenAL and Vulkan. It is suitable for games, scientific visualizations and projects that require 3d graphics, audio or compute functionality. Features - - Create cutting-edge graphics with OpenGL 4.4 and OpenGL ES 3.0 + - Create cutting-edge graphics with OpenGL 4.6, OpenGL ES 3.0 and Vulkan - Use the .Net/Mono language of your choice: C#, F#, VB.Net, Boo, IronPython, IronRuby - - Develop faster with inline documentation and strongly-typed enumerations for all OpenGL and OpenAL functions + - Develop faster with inline documentation and strongly-typed enumerations for all OpenGL, OpenAL and Vulkan functions This is a .NET Core-compatible version of OpenTK. -This version can be found at https://github.com/emmauss/opentk +This version can be found at https://github.com/Ryujinx/Opentk OpenTK.NetStandard emmaus emmaus OpenTK https://github.com/Ryujinx/Opentk - 1.1.7.0 - 1.1.7.0 + 1.0.5.0 + 1.0.5.0