From d7fa232b16846f4945f1d36695d0eb7b30a01bbe Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jean-Philippe=20Bruy=C3=A8re?= Date: Sun, 2 Feb 2020 17:17:42 +0100 Subject: [PATCH] Fence as activable + Fence collection, split glfw bindings in glfw-sharp external project, documentation --- README.md | 37 +- .../DistanceFieldFont.csproj | 4 +- .../EnvironmentPipeline.csproj | 4 +- addons/VkvgPipeline/VkvgPipeline.csproj | 4 +- addons/gltfLoader/gltfLoader.csproj | 4 +- samples/ClearScreen/ClearScreen.csproj | 5 + samples/ClearScreen/README.md | 91 +++ samples/ClearScreen/main.cs | 78 +++ samples/Textured/README.md | 25 + samples/Textured/Textured.csproj | 4 - samples/Textured/main.cs | 4 +- samples/Triangle/README.md | 118 ++-- samples/Triangle/main.cs | 86 +-- samples/Triangle/shaders/main.vert | 10 +- samples/screenShots/ClearScreen.png | Bin 0 -> 1797 bytes samples/screenShots/Textured.png | Bin 0 -> 31459 bytes samples/screenShots/Triangle.png | Bin 0 -> 7393 bytes vke.net.sln | 18 +- vke/src/VkWindow.cs | 11 +- vke/src/base/Activable.cs | 11 +- vke/src/base/Buffer.cs | 139 +++-- vke/src/base/CommandBuffer.cs | 17 +- vke/src/base/DescriptorPool.cs | 30 +- vke/src/base/DescriptorSet.cs | 2 +- vke/src/base/Device.cs | 56 +- vke/src/base/Fence.cs | 82 +++ vke/src/base/FrameBuffer.cs | 57 +- vke/src/base/GPUBuffer.cs | 21 +- vke/src/base/GraphicPipeline.cs | 24 +- vke/src/base/HostBuffer.cs | 176 ++++-- vke/src/base/Image.cs | 497 +++++++++------- vke/src/base/Queue.cs | 2 +- vke/src/base/RenderPass.cs | 6 +- vke/src/base/Resource.cs | 54 +- vke/src/base/SwapChain.cs | 174 +++--- vke/src/glfw/CodePoint.cs | 39 -- vke/src/glfw/Delegates.cs | 127 ----- vke/src/glfw/ErrorCode.cs | 53 -- vke/src/glfw/Glfw3.cs | 533 ------------------ vke/src/glfw/InputAction.cs | 25 - vke/src/glfw/Key.cs | 134 ----- vke/src/glfw/Modifier.cs | 20 - vke/src/glfw/MonitorEvent.cs | 21 - vke/src/glfw/MonitorHandle.cs | 30 - vke/src/glfw/MouseButton.cs | 61 -- vke/src/glfw/NativeString.cs | 42 -- vke/src/glfw/VideoMode.cs | 43 -- vke/src/glfw/VideoModePointer.cs | 34 -- vke/src/glfw/WindowAttribute.cs | 184 ------ vke/vke.csproj | 6 +- 50 files changed, 1169 insertions(+), 2034 deletions(-) create mode 100644 samples/ClearScreen/ClearScreen.csproj create mode 100644 samples/ClearScreen/README.md create mode 100644 samples/ClearScreen/main.cs create mode 100644 samples/Textured/README.md create mode 100644 samples/screenShots/ClearScreen.png create mode 100644 samples/screenShots/Textured.png create mode 100644 samples/screenShots/Triangle.png create mode 100644 vke/src/base/Fence.cs delete mode 100644 vke/src/glfw/CodePoint.cs delete mode 100644 vke/src/glfw/Delegates.cs delete mode 100644 vke/src/glfw/ErrorCode.cs delete mode 100644 vke/src/glfw/Glfw3.cs delete mode 100644 vke/src/glfw/InputAction.cs delete mode 100644 vke/src/glfw/Key.cs delete mode 100644 vke/src/glfw/Modifier.cs delete mode 100644 vke/src/glfw/MonitorEvent.cs delete mode 100644 vke/src/glfw/MonitorHandle.cs delete mode 100644 vke/src/glfw/MouseButton.cs delete mode 100644 vke/src/glfw/NativeString.cs delete mode 100644 vke/src/glfw/VideoMode.cs delete mode 100644 vke/src/glfw/VideoModePointer.cs delete mode 100644 vke/src/glfw/WindowAttribute.cs diff --git a/README.md b/README.md index f214c62..aad2315 100644 --- a/README.md +++ b/README.md @@ -24,9 +24,9 @@
adaptation of the gltf PBR sample from Sacha Willems

-**vke.net** (_vulkan engine for .net_) is composed of high level classes encapsulating [vulkan]() objects with `IDispose` model and **reference counting**. [GLFW](https://www.glfw.org/) handles the windowing system. - +**vke.net** (_vulkan engine for .net_) is composed of high level classes encapsulating [vulkan]() objects and commands with `IDispose` model and **reference counting**. [GLFW](https://www.glfw.org/) handles the windowing system. +Vke use autogenerated [vk.net](https://github.com/jpbruyere/vk.net) library for low level binding to vulkan. Use the 'download_datas.sh' script for downloading sample's datas. @@ -36,6 +36,39 @@ Use the 'download_datas.sh' script for downloading sample's datas. - [Vulkan Sdk](https://www.lunarg.com/vulkan-sdk/), **glslc** has to be in the path. - optionaly for ui, you will need [vkvg](https://github.com/jpbruyere/vkvg). +### Quick Start + +Create a new dotnet console project, and add the [vje nuget package](https://www.nuget.org/packages/vke) to it. + +```xml + + net472 + Exe + + + + + +``` +For automatic shader compilation to SpirV, add also the [SpirVTasks nuget package](https://www.nuget.org/packages/SpirVTasks/0.1.41-beta). For documentation about this module, follow [this link](SpirVTasks/README.md). + +```xml + + + + + +``` +### Samples + +| Title | Screen shots | +| :----------------------------------: | :------------------------------------------------: | +| [ClearScreen](ClearScreen/README.md) | ![screenshot](samples/screenShots/ClearScreen.png) | +| [Triangle](Triangle/README.md) | ![screenshot](samples/screenShots/Triangle.png) | +| [Textured](Textured/README.md) | ![screenshot](samples/screenShots/Textured.png) | + + + ### Features - physicaly based rendering, direct and deferred diff --git a/addons/DistanceFieldFont/DistanceFieldFont.csproj b/addons/DistanceFieldFont/DistanceFieldFont.csproj index 93faa27..357c696 100644 --- a/addons/DistanceFieldFont/DistanceFieldFont.csproj +++ b/addons/DistanceFieldFont/DistanceFieldFont.csproj @@ -3,10 +3,10 @@ DistanceFieldFont vke.DistanceFieldFont - 0.1.0 + $(VkeReleaseVersion) vke.net signed distance field font addons, BMFont file format vulkan C# vke.net gltf - $(AssemblyVersion)-beta + $(VkePackageVersion) True False https://github.com/jpbruyere/vke.net/blob/master/README.md diff --git a/addons/EnvironmentPipeline/EnvironmentPipeline.csproj b/addons/EnvironmentPipeline/EnvironmentPipeline.csproj index 1344f29..c93c847 100644 --- a/addons/EnvironmentPipeline/EnvironmentPipeline.csproj +++ b/addons/EnvironmentPipeline/EnvironmentPipeline.csproj @@ -3,10 +3,10 @@ EnvironmentPipeline vke.EnvironmentPipeline - 0.1.2 + $(VkeReleaseVersion) vke.net Environment cube pipeline vulkan c# vke.net - $(AssemblyVersion)-beta + $(VkePackageVersion) True False https://github.com/jpbruyere/vke.net/blob/master/README.md diff --git a/addons/VkvgPipeline/VkvgPipeline.csproj b/addons/VkvgPipeline/VkvgPipeline.csproj index 16c1daa..d010f02 100644 --- a/addons/VkvgPipeline/VkvgPipeline.csproj +++ b/addons/VkvgPipeline/VkvgPipeline.csproj @@ -3,10 +3,10 @@ vke.vkvgPipeline vke.vkvgPipeline - 0.1.0 + $(VkeReleaseVersion) CVKL vkvg addons, vectorial drawing with cairo like api. vulkan c# vke.net gltf - $(AssemblyVersion)-beta + $(AssemblyVersion) True False https://github.com/jpbruyere/vk.net/blob/master/README.md diff --git a/addons/gltfLoader/gltfLoader.csproj b/addons/gltfLoader/gltfLoader.csproj index a9474c4..b7940e5 100644 --- a/addons/gltfLoader/gltfLoader.csproj +++ b/addons/gltfLoader/gltfLoader.csproj @@ -3,10 +3,10 @@ vke.gltfLoader vke.gltfLoader - 0.1.8 + $(VkeReleaseVersion) vke.net gltf addons C# vulkan CVKL gltf - $(AssemblyVersion)-beta + $(AssemblyVersion) True False https://github.com/jpbruyere/vke.net/blob/master/README.md diff --git a/samples/ClearScreen/ClearScreen.csproj b/samples/ClearScreen/ClearScreen.csproj new file mode 100644 index 0000000..3cf0386 --- /dev/null +++ b/samples/ClearScreen/ClearScreen.csproj @@ -0,0 +1,5 @@ + + + false + + diff --git a/samples/ClearScreen/README.md b/samples/ClearScreen/README.md new file mode 100644 index 0000000..dc9f101 --- /dev/null +++ b/samples/ClearScreen/README.md @@ -0,0 +1,91 @@ +### The Project File. + +To build a minimal vulkan application, add the [vke](https://www.nuget.org/packages/vke/) nuget package, and to enable automatic shader compilation, add the [SpirVTasks](https://www.nuget.org/packages/SpirVTasks/) package and a generic **GLSLShader** item globing a full directory. + +```xml + + net472 + Exe + + + + + + + + + +``` + +### VkWindow class + +**vke** use [GLFW](https://www.glfw.org/) to interface with the windowing system of the OS. Derive your application from the `VkWindow` base class to start with a vulkan enabled window. **Validation** and **RenderDoc** layers loading may be control at startup with public static boolean properties from the `Instance`class. + +```csharp +class Program : VkWindow { + static void Main (string[] args) { + using (Program vke = new Program ()) { + vke.Run (); + } + } +} +``` + +### Vulkan Initialization + +`init_vulkan` is the first method called by the 'Run' method. Default initialization will provide a vulkan window, a default swap chain bound to it, and a draw and present semaphore to sync the rendering. +```csharp +protected override void initVulkan () { + base.initVulkan (); +``` +There are several method to clear the screen with vulkan. One is to use the renderpass CLEAR load operation so that attachment layout transitioning is handled automatically by the render pass. +```csharp + renderPass = new RenderPass (dev, swapChain.ColorFormat); + renderPass.ClearValues[0] = new VkClearValue (0.1f, 0.2f, 1); + renderPass.Activate (); + + cmds = cmdPool.AllocateCommandBuffer (swapChain.ImageCount); +} +``` + +Note that because we only reset the command buffers when rebuilding these, we need to preallocate them during the initialization. + +### Frame buffer creation + +The resize method is called at least once before any rendering, so it's a safe place to initialize output size related vulkan objects like the frame buffers. vke provide a FrameBuffer collection object to ease handling of multiple related buffers like those used for a swap chain for example.. +```csharp +FrameBuffers frameBuffers; + +protected override void OnResize () { + base.OnResize (); + + frameBuffers?.Dispose(); + frameBuffers = renderPass.CreateFrameBuffers(swapChain); + + buildCommandBuffers (); +} +``` +It's common to rebuild the command buffers targeting the swap chain images after a resize so that the drawing is scaled. So it's a good idea to build/rebuild your commands here. + + + +### The command buffers + +The `VkWindow` class has a default array of command buffers, one for each swap chain image. But it's up to you to allocate and populate them. +Here we simply record a begin/end render pass to clear the screen with the load operation of it. + +```csharp +void buildCommandBuffers() { + cmdPool.Reset (VkCommandPoolResetFlags.ReleaseResources); + + for (int i = 0; i < swapChain.ImageCount; ++i) { + cmds[i].Start (); + + renderPass.Begin (cmds[i], frameBuffers[i]); + + renderPass.End (cmds[i]); + + cmds[i].End (); + } +} +``` diff --git a/samples/ClearScreen/main.cs b/samples/ClearScreen/main.cs new file mode 100644 index 0000000..3e11384 --- /dev/null +++ b/samples/ClearScreen/main.cs @@ -0,0 +1,78 @@ +// Copyright (c) 2019 Jean-Philippe Bruyère +// +// This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) +using vke; +using Vulkan; + +//Most simple example of the `VkWindow` class usage to output something on screen. +namespace ClearScreen { + class Program : VkWindow { + //excutable entry point + static void Main (string[] args) { + //the base constructor will create the window with GLFW + using (Program vke = new Program ()) { + vke.Run (); + } + } + + //frame buffer collection to handle on fb per swapchain image. + FrameBuffers frameBuffers; + RenderPass renderPass; + + //Vulkan initialization is the first method called by the 'Run' method. + //Default initialization will provide a vulkan window, a default swapchain + //bound to it, and a draw and present semaphore to sync the rendering. + protected override void initVulkan () { + base.initVulkan (); + + //there are several method to clear the screen with vulkan. One is to + //use the renderpass CLEAR load operation so that attachment layout transitioning + //is handled automatically by the render pass. + renderPass = new RenderPass (dev, swapChain.ColorFormat); + //default clear values are automatically added for each attacments + renderPass.ClearValues[0] = new VkClearValue (0.1f, 0.2f, 1); + //bound to a pipeline, renderpasses are automatically activated, here we use + //a stand alone renderpass just to clear the screen, so we have to + //activate it manually + renderPass.Activate (); + + //allocate default cmd buffers of the VkWindow class. + cmds = cmdPool.AllocateCommandBuffer (swapChain.ImageCount); + } + + void buildCommandBuffers() { + cmdPool.Reset (); + + for (int i = 0; i < swapChain.ImageCount; ++i) { + FrameBuffer fb = frameBuffers[i]; + cmds[i].Start (); + + renderPass.Begin (cmds[i], fb); + renderPass.End (cmds[i]); + + cmds[i].End (); + } + } + + //The resize method is called at least once before any rendering, so it's + //a safe place to initialize output size related vulkan objects like the + //frame buffers. + protected override void OnResize () { + base.OnResize (); + + frameBuffers?.Dispose(); + frameBuffers = renderPass.CreateFrameBuffers(swapChain); + + buildCommandBuffers (); + } + //clean up + protected override void Dispose (bool disposing) { + dev.WaitIdle (); + + renderPass.Dispose (); + frameBuffers?.Dispose(); + + base.Dispose (disposing); + } + } +} diff --git a/samples/Textured/README.md b/samples/Textured/README.md new file mode 100644 index 0000000..331e752 --- /dev/null +++ b/samples/Textured/README.md @@ -0,0 +1,25 @@ +### Enabling extensions + +The `VkWindow` class provides two properties that you may override to enable additional extensions. + +### Enabling features + +Override the `configureEnabledFeatures` method of `VkWindow` to enable features. +```csharp +protected override void configureEnabledFeatures ( + VkPhysicalDeviceFeatures available_features, + ref VkPhysicalDeviceFeatures enabled_features) +{ + enabled_features.samplerAnisotropy = available_features.samplerAnisotropy; +} +``` +### Creating queues + +To create queues, override the `createQueues` method of `VkWindow`. This function is called before the logical device creation and will take care of physically available queues, creating duplicates if count exceed availability. The `base` method will create a default presentable queue. + +```csharp +protected override void createQueues () { + base.createQueues (); + transferQ = new Queue (dev, VkQueueFlags.Transfer); +} +``` \ No newline at end of file diff --git a/samples/Textured/Textured.csproj b/samples/Textured/Textured.csproj index bd178d8..35e3d84 100644 --- a/samples/Textured/Textured.csproj +++ b/samples/Textured/Textured.csproj @@ -1,6 +1,2 @@ - - - - diff --git a/samples/Textured/main.cs b/samples/Textured/main.cs index fb671bb..78da387 100644 --- a/samples/Textured/main.cs +++ b/samples/Textured/main.cs @@ -13,7 +13,6 @@ namespace Textured { static void Main (string[] args) { #if DEBUG Instance.VALIDATION = true; - Instance.RENDER_DOC_CAPTURE = true; #endif using (Program vke = new Program ()) { vke.Run (); @@ -234,9 +233,10 @@ namespace Textured { } protected override void Dispose (bool disposing) { + dev.WaitIdle (); + if (disposing) { if (!isDisposed) { - dev.WaitIdle (); pipeline.Dispose (); dsLayout.Dispose (); frameBuffers.Dispose(); diff --git a/samples/Triangle/README.md b/samples/Triangle/README.md index 07c2895..436391f 100644 --- a/samples/Triangle/README.md +++ b/samples/Triangle/README.md @@ -1,92 +1,60 @@ -### The Project File. +### Creating buffers -To build a minimal vulkan application, add the [vke](https://www.nuget.org/packages/vke/) nuget package, and to enable automatic shader compilation, add the [SpirVTasks](https://www.nuget.org/packages/SpirVTasks/) package and a generic **GLSLShader** item globing a full directory. - -```xml - - net472 - Exe - - - - - - - - +Vke has two classes to handle buffers. Mappable [`HostBuffer`](../../wiki/api/HostBuffer) and device only [`GPUBuffer`](../../wiki/api/GPUBuffer). +For this first simple example, we will only use host mappable buffers. Those classes can handle a Generic argument of a blittable type to handle arrays. Resources like buffers or images are automatically activated, so they need to be explicitly disposed on cleanup. Create them in the `initVulkan` override. +```csharp + //the vertex buffer + vbo = new HostBuffer (dev, VkBufferUsageFlags.VertexBuffer, vertices); + //the index buffer + ibo = new HostBuffer (dev, VkBufferUsageFlags.IndexBuffer, indices); + //a permanantly mapped buffer for the mvp matrice + uboMats = new HostBuffer (dev, VkBufferUsageFlags.UniformBuffer, mvp, true); ``` -### VkWindow class - -**vke** use [GLFW](https://www.glfw.org/) to interface with the windowing system of the OS. Derive your application from the `VkWindow` base class to start with a vulkan enabled window. **Validation** and **RenderDoc** layers loading may be control at startup with public static boolean properties from the `Instance`class. - +To be able to access the mvp matrix in a shader, we need a descriptor. This implies to create a descriptor pool to allocate it from and configure the triangle pipeline layout with a corresponding descriptor layout for our matrix. ```csharp -class Program : VkWindow { - static void Main (string[] args) { - Instance.VALIDATION = true; - using (Program vke = new Program ()) { - vke.Run (); - } - } -} + descriptorPool = new DescriptorPool (dev, 1, new VkDescriptorPoolSize (VkDescriptorType.UniformBuffer)); ``` -### Vulkan Initialization - -Default vulkan initialization of the VkWindow class will provide the minimal for running and present simple command buffers. For further initialization steps, override the `init_vulkan`method. - +Graphic pipeline configuration are predefined by the [`GraphicPipelineConfig`](../../wiki/api/GraphicPipelineConfig) class, which ease sharing configs for several pipelines having lots in common. The pipeline layout will be automatically activated on pipeline creation, so that sharing layout among different pipelines will benefit from the reference counting to automatically dispose unused layout on pipeline clean up. It's the same for [`DescriptorSetLayout`](../../wiki/api/DescriptorSetLayout). ```csharp -protected override void initVulkan () { - base.initVulkan (); - vbo = new HostBuffer (dev, VkBufferUsageFlags.VertexBuffer, vertices); - ibo = new HostBuffer (dev, VkBufferUsageFlags.IndexBuffer, indices); - uboMats = new HostBuffer (dev, VkBufferUsageFlags.UniformBuffer, matrices); - ... +GraphicPipelineConfig cfg = GraphicPipelineConfig.CreateDefault ( + VkPrimitiveTopology.TriangleList, VkSampleCountFlags.SampleCount1, false); + +cfg.Layout = new PipelineLayout (dev, + new DescriptorSetLayout (dev, + new VkDescriptorSetLayoutBinding ( + 0, VkShaderStageFlags.Vertex, VkDescriptorType.UniformBuffer))); ``` -### Enabling extensions - -The `VkWindow` class provides two properties that you may override to enable additional extensions. The `Ext` static class of the vulkan package provides up to date lists of existing vulkan extensions for convenience. - +Next we configure a default [`RenderPass`](../../wiki/api/RenderPass) with just a color attachment for the swap chain image, a default sub-pass is automatically created and the render pass activation will follow the pipeline life cycle and will be automatically disposed when no longer in use. ```csharp -public virtual string[] EnabledInstanceExtensions => null; -public virtual string[] EnabledDeviceExtensions => - new string[] { Ext.D.VK_KHR_swapchain }; + cfg.RenderPass = new RenderPass (dev, swapChain.ColorFormat, cfg.Samples); ``` - -### Enabling features - -Override the `configureEnabledFeatures` method of `VkWindow` to enable features. Available features queried from the selected physical device are provided as argument. +Configuration of vertex bindings and attributes ```csharp -protected override void configureEnabledFeatures ( - VkPhysicalDeviceFeatures available_features, - ref VkPhysicalDeviceFeatures enabled_features) { - - enabled_features.samplerAnisotropy = available_features.samplerAnisotropy; -} + cfg.AddVertexBinding (0); + cfg.AddVertexAttributes (0, VkFormat.R32g32b32Sfloat, //position + VkFormat.R32g32b32Sfloat);//color ``` -### Creating queues - -To create queues, override the `createQueues` method of `VkWindow`. This function is called before the logical device creation and will take care of physically available queues, creating duplicates if count exceed availability. The `base` method will create a default presentable queue. - +shader are automatically compiled by [`SpirVTacks`](../../SpirVTasks/README.md) if added to the project. The resulting shaders are automatically embedded in the assembly. To specifiy that the shader path is a resource name, put the **'#'** prefix. Else the path will be search on disk. ```csharp -protected override void createQueues () { - base.createQueues (); - transferQ = new Queue (dev, VkQueueFlags.Transfer); -} + cfg.AddShader (VkShaderStageFlags.Vertex, "#shaders.main.vert.spv"); + cfg.AddShader (VkShaderStageFlags.Fragment, "#shaders.main.frag.spv"); ``` -### Rendering - -VkWindow will provide the default swapchain, but it's up to you to create the frame buffers. For the triangle example, create them in the `OnResize` override. The `RenderPass` class has the ability to create a framebuffer collection for a given swapchain. The `OnResize` method is guarantied to be called once before entering the rendering loop, so that it is a safe place to call the building of your command buffers. +Once the pipeline configuration is complete, we use it to effectively create and activate a graphic pipeline. Activables used by the pipeline (like the RenderPass, or the PipelineLayout) are referenced in the newly created managed pipeline. So the Configuration object doesn't need cleanup. ```csharp -FrameBuffers frameBuffers; - -protected override void OnResize () { - base.OnResize (); - - frameBuffers?.Dispose(); - frameBuffers = pipeline.RenderPass.CreateFrameBuffers(swapChain); - - buildCommandBuffers (); -} + pipeline = new GraphicPipeline (cfg); +``` +Because descriptor layouts used for a pipeline are only activated on pipeline activation, descriptor sets must not be allocated before, except if the layout has been manually activated, but in this case, layouts will also need to be explicitly disposed. +```csharp + descriptorSet = descriptorPool.Allocate (pipeline.Layout.DescriptorSetLayouts[0]); ``` +The descriptor update is a two step operation. First we create a [`DescriptorSetWrites`](../../wiki/api/DescriptorSetWrites) object defining the layout(s), than we write the descriptor(s). +The `Descriptor` property of the mvp HostBuffer will return a default descriptor with no offset of the full size of the buffer. +```csharp + DescriptorSetWrites uboUpdate = + new DescriptorSetWrites (descriptorSet, pipeline.Layout.DescriptorSetLayouts[0]); + + uboUpdate.Write (dev, uboMats.Descriptor); +``` diff --git a/samples/Triangle/main.cs b/samples/Triangle/main.cs index e9b1996..70d771c 100644 --- a/samples/Triangle/main.cs +++ b/samples/Triangle/main.cs @@ -1,14 +1,12 @@ // Copyright (c) 2019 Jean-Philippe Bruyère // // This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) -using System; -using System.IO; using System.Numerics; using System.Runtime.InteropServices; -using System.Xml.Serialization; using vke; using Vulkan; +//the traditional triangle sample namespace Triangle { class Program : VkWindow { static void Main (string[] args) { @@ -18,15 +16,9 @@ namespace Triangle { } const float rotSpeed = 0.01f, zoomSpeed = 0.01f; - float rotX, rotY, rotZ = 0f, zoom = 1f; - - [StructLayout (LayoutKind.Sequential)] - struct Matrices { - public Matrix4x4 projection; - public Matrix4x4 view; - public Matrix4x4 model; - } + float rotX, rotY, zoom = 1f; + //vertex structure [StructLayout(LayoutKind.Sequential)] struct Vertex { Vector3 position; @@ -38,18 +30,19 @@ namespace Triangle { } } - Matrices matrices; + Matrix4x4 mvp; //the model view projection matrix - HostBuffer ibo; - HostBuffer vbo; - HostBuffer uboMats; + HostBuffer ibo; //a host mappable buffer to hold the indices. + HostBuffer vbo; //a host mappable buffer to hold vertices. + HostBuffer uboMats; //a host mappable buffer for mvp matrice. DescriptorPool descriptorPool; - DescriptorSet descriptorSet; + DescriptorSet descriptorSet;//descriptor set for the mvp matrice. - FrameBuffers frameBuffers; - GraphicPipeline pipeline; + FrameBuffers frameBuffers; //the frame buffer collection coupled to the swapchain images + GraphicPipeline pipeline; //the triangle rendering pipeline + //triangle vertices (position + color per vertex) and indices. Vertex[] vertices = { new Vertex (-1.0f, -1.0f, 0.0f , 1.0f, 0.0f, 0.0f), new Vertex ( 1.0f, -1.0f, 0.0f , 0.0f, 1.0f, 0.0f), @@ -57,57 +50,63 @@ namespace Triangle { }; ushort[] indices = new ushort[] { 0, 1, 2 }; - Program () : base () {} - protected override void initVulkan () { base.initVulkan (); + //first create the needed buffers vbo = new HostBuffer (dev, VkBufferUsageFlags.VertexBuffer, vertices); ibo = new HostBuffer (dev, VkBufferUsageFlags.IndexBuffer, indices); - uboMats = new HostBuffer (dev, VkBufferUsageFlags.UniformBuffer, matrices); + //because mvp matrice may be updated by mouse move, we keep it mapped after creation. + uboMats = new HostBuffer (dev, VkBufferUsageFlags.UniformBuffer, mvp, true); + //a descriptor pool to allocate the mvp matrice descriptor from. descriptorPool = new DescriptorPool (dev, 1, new VkDescriptorPoolSize (VkDescriptorType.UniformBuffer)); + //Graphic pipeline configuration are predefined by the GraphicPipelineConfig class, which ease sharing config for several pipelines having lots in common. GraphicPipelineConfig cfg = GraphicPipelineConfig.CreateDefault (VkPrimitiveTopology.TriangleList, VkSampleCountFlags.SampleCount1, false); - + //Create the pipeline layout, it will be automatically activated on pipeline creation, so that sharing layout among different pipelines will benefit + //from the reference counting to automatically dispose unused layout on pipeline clean up. It's the same for DescriptorSetLayout. cfg.Layout = new PipelineLayout (dev, - new DescriptorSetLayout (dev, - new VkDescriptorSetLayoutBinding (0, VkShaderStageFlags.Vertex | VkShaderStageFlags.Fragment, VkDescriptorType.UniformBuffer))); - + new DescriptorSetLayout (dev, new VkDescriptorSetLayoutBinding (0, VkShaderStageFlags.Vertex, VkDescriptorType.UniformBuffer))); + //create a default renderpass with just a color attachment for the swapchain image, a default subpass is automatically created and the renderpass activation + //will follow the pipeline life cicle and will be automatically disposed when no longuer used. cfg.RenderPass = new RenderPass (dev, swapChain.ColorFormat, cfg.Samples); + //configuration of vertex bindings and attributes cfg.AddVertexBinding (0); - cfg.AddVertexAttributes (0, VkFormat.R32g32b32Sfloat, VkFormat.R32g32b32Sfloat); + cfg.AddVertexAttributes (0, VkFormat.R32g32b32Sfloat, VkFormat.R32g32b32Sfloat);//position + color + //shader are automatically compiled by SpirVTacks if added to the project. The resulting shaders are automatically embedded in the assembly. + //To specifiy that the shader path is a resource name, put the '#' prefix. Else the path will be search on disk. cfg.AddShader (VkShaderStageFlags.Vertex, "#shaders.main.vert.spv"); cfg.AddShader (VkShaderStageFlags.Fragment, "#shaders.main.frag.spv"); + //create and activate the pipeline with the configuration we've just done. pipeline = new GraphicPipeline (cfg); - //note that descriptor set is allocated after the pipeline creation that use this layout, layout is activated - //automaticaly on pipeline creation, and will be disposed automatically when no longuer in use. + //because descriptor layout used for a pipeline are only activated on pipeline activation, descriptor set must not be allocated before, except if the layout has been manually activated, + //but in this case, layout will need also to be explicitly disposed. descriptorSet = descriptorPool.Allocate (pipeline.Layout.DescriptorSetLayouts[0]); + //Write the content of the descriptor, the mvp matrice. DescriptorSetWrites uboUpdate = new DescriptorSetWrites (descriptorSet, pipeline.Layout.DescriptorSetLayouts[0]); + //Descriptor property of the mvp buffer will return a default descriptor with no offset of the full size of the buffer. uboUpdate.Write (dev, uboMats.Descriptor); - uboMats.Map (); - + //allocate the default VkWindow buffers, one per swapchain image. Their will be only reset when rebuilding and not reallocated. cmds = cmdPool.AllocateCommandBuffer (swapChain.ImageCount); } + //view update override, see base method for more informations. public override void UpdateView () { - matrices.projection = Utils.CreatePerspectiveFieldOfView (Utils.DegreesToRadians (45f), - (float)swapChain.Width / (float)swapChain.Height, 0.1f, 256.0f); - matrices.view = - Matrix4x4.CreateFromAxisAngle (Vector3.UnitZ, rotZ) * + mvp = Matrix4x4.CreateFromAxisAngle (Vector3.UnitY, rotY) * Matrix4x4.CreateFromAxisAngle (Vector3.UnitX, rotX) * - Matrix4x4.CreateTranslation (0, 0, -3f * zoom); - matrices.model = Matrix4x4.Identity; - uboMats.Update (matrices, (uint)Marshal.SizeOf ()); - updateViewRequested = false; - } + Matrix4x4.CreateTranslation (0, 0, -3f * zoom) * + Utils.CreatePerspectiveFieldOfView (Utils.DegreesToRadians (45f), (float)swapChain.Width / (float)swapChain.Height, 0.1f, 256.0f); + uboMats.Update (mvp, (uint)Marshal.SizeOf ()); + base.UpdateView (); + } protected override void onMouseMove (double xPos, double yPos) { double diffX = lastMouseX - xPos; double diffY = lastMouseY - yPos; @@ -118,6 +117,8 @@ namespace Triangle { zoom += zoomSpeed * (float)diffY; } else return; + //VkWindow has a boolean for requesting a call to 'UpdateView', it will be + //reset by the 'UpdateView' base method or the custom override. updateViewRequested = true; } @@ -156,15 +157,18 @@ namespace Triangle { buildCommandBuffers (); } - + //clean up protected override void Dispose (bool disposing) { dev.WaitIdle (); if (disposing) { if (!isDisposed) { + //pipeline clean up will dispose PipelineLayout, DescriptorSet layouts and render pass automatically. If their reference count is zero, their handles will be destroyed. pipeline.Dispose (); - + //frame buffers are automatically activated on creation as for resources, so it requests an explicit call to dispose. frameBuffers?.Dispose(); + //the descriptor pool descriptorPool.Dispose (); + //resources have to be explicityly disposed. vbo.Dispose (); ibo.Dispose (); uboMats.Dispose (); diff --git a/samples/Triangle/shaders/main.vert b/samples/Triangle/shaders/main.vert index 542d015..0997ca9 100644 --- a/samples/Triangle/shaders/main.vert +++ b/samples/Triangle/shaders/main.vert @@ -8,10 +8,8 @@ layout (location = 1) in vec3 inColor; layout (binding = 0) uniform UBO { - mat4 projectionMatrix; - mat4 viewMatrix; - mat4 modelMatrix; -} ubo; + mat4 mvp; +}; layout (location = 0) out vec3 outColor; @@ -24,7 +22,5 @@ out gl_PerVertex void main() { outColor = inColor; - gl_Position = ubo.projectionMatrix * ubo.viewMatrix * ubo.modelMatrix * vec4(inPos.xyz, 1.0); - //gl_Position.y = -gl_Position.y; - //gl_Position.z = (gl_Position.z + gl_Position.w) / 2.0; + gl_Position = mvp * vec4(inPos.xyz, 1.0); } diff --git a/samples/screenShots/ClearScreen.png b/samples/screenShots/ClearScreen.png new file mode 100644 index 0000000000000000000000000000000000000000..c80d0701137c0ae6e1f6878057e7b22e3e7830ef GIT binary patch literal 1797 zcmeAS@N?(olHy`uVBq!ia0vp^CxCbs2OE%lBgdY^z`)p=>FgZf>FlgfP?VpRnUl)E zpfRy_qOHf_0FhSzVAqwR?A9F?DJynG2#6M5(Gpqcv_dqh)S&XEyh)}

c-g^`>U~ z?of8|^jO&#R>u$QM^0Y!yy)t+M_+SG$HzmDYv+`of4KKI!@{_HY7|zX~lDV`ftNsAKFiyP~av-| zdtvv8z_8BqoyUE4DSTAEF4}+JLOe#SBJGIJ@@JjON0JuyPBlw&4OX6~)VFGu-%qDw z$x}azrLT=iJzM=rysh}xDWmI|yo!ykI*v^otf5l^+Il74T4{;}mB@Yn$iJ(uGlpxY zSHhDB2Ue++>-_)N_ort+Raf7$q(J6HP2rsW#0A;n8CPVU|GrTurS9-Sa>u3Ue_paP zeyZ%fc4?8j!+o=Y!n>EI*ghy?m#8pG2`*czpsP5a{oeT(vo|^X*A|@t4dK zmPM-OH#9pZEOEH`+V1_ky!p5H+n)XTmx0}^sAk84TaSV9!j|Oi?!xdN1Q+aGJ{c&& zS>O>_%)p?h48n{ROYO^mg6t)pzOL*~m>9YEc=K)uUjYh9mbgZgIOpf)rskC}I2WZR zmZYXAlxLP?D7bt2281{Ai8C;;-0^gA45_&F_O^Gvbf`r8$N!ea$EM%NyQEec9olLZ zB+zupOV>$Z8ppK_&NU2njN0F7IF6VnoL`j0{ECe;@D{7q3a!0M#V6mBxu0e;eY)!< zjZ9lc?^uN|f0k%m>kLo-lyWZH`rT#yefw$@dd~T&DZfn&lG(Fqk;t=@+xPE&OWvM+ z_wBErd40LF!<8$RMt*x#C8K$=%Qkyr@uz#*+Fj4*Nl)?lEdI@&&vE;IsTj`Li$C7H zlm3e3rOS5ZlP9Z}uih@Vaz0D%B7Fdz2xn&0Ok7$%+D|6S@Ei=O>I3lH|O=GwF~EPXPM7!o4oft z@5O83GgGVnpH=o+K2z`CzmV>=3l6$im7Z8>e{Rd2l`n6(EeyMBGNWzt!+(=QwiYe9 z?5@0aZ&Akc^*5*5zsue`KWoafm`=+zI@?00#htB+-F~gw>iacL+nOKC>u#@j{U-=3kwS?DOkC<odRp)3$wk3nE|p&lSs> zD96ve^Sa%?Qzma;pAmdH_j3F8Uj=^Rb-R|o_V>v=CzvhgI`Q;x57$5qm$=6-L$+#Y zw0JyDS!8j<$g*kLmbGzDc~no)T>GojX1?6LTDkPq#z}jwRIk6bb)Vt2R~x6*?Xe5Ab&*n;6#e&w zxAl#<$u-{FUgx~I8>W#K!|})5a{0{t^Np|H{q`e$^So?*p2o^+*Ux^PFDmsid2Y>P z=c~7l-z-eHow8xwy|3?|-sD;!)yTlYB*5XIz<|PNaA06!A5YzU$d-sNlzyc$oWHv^LON>m6 zanB~aTVm12!Lp*SrG6)?)_aAmQ9cR|Pyal$ZDiQ|xFE}H7SI5jB+o8eV-ADhz*)Z@ z3pO%LJ+5<{hbhG9@!>9qrEYV9&hYZIQWaR>66`qOn@kN34LcsoCW}c31~wp0a*7Un~8CTBbMOA40W8ri5fX@ji`~s!SW-XEs1qE z!i7qnC*ctg6o zw)S>8LCy`uhdCxq@t4bKPdua8u%zbF?OCqZ?)`n^dG?rh4(EpJS4`*s<6Y~MTYhrI St=GW9kipZ{&t;ucLK6V!k?!mO literal 0 HcmV?d00001 diff --git a/samples/screenShots/Textured.png b/samples/screenShots/Textured.png new file mode 100644 index 0000000000000000000000000000000000000000..871f353f6f82bbae40d4740e41f8f9740b17a3b4 GIT binary patch literal 31459 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 b?5oF#fs35DV`8S#fIyZGjQlgKrZbK&8~ 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 Y1NmvOw`VI=M*si-07*qoM6N<$f>b@31poj5 literal 0 HcmV?d00001 diff --git a/samples/screenShots/Triangle.png b/samples/screenShots/Triangle.png new file mode 100644 index 0000000000000000000000000000000000000000..0340b5668cb166474d9aeb554cebdd9ea2a51aa6 GIT binary patch literal 7393 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 literal 0 HcmV?d00001 diff --git a/vke.net.sln b/vke.net.sln index 1ce579e..f8baa1e 100644 --- a/vke.net.sln +++ b/vke.net.sln @@ -8,11 +8,12 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "global", "global", "{7285454A-930F-4536-AB84-C076B44C0C80}" ProjectSection(SolutionItems) = preProject Directory.Build.props = Directory.Build.props + README.md = README.md EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "addons", "addons", "{4AA67AB0-C331-4CB2-9C00-B74F5DE31658}" ProjectSection(SolutionItems) = preProject - addons/Directory.Build.props = "Directory.Build.props" + addons\Directory.Build.props = addons\Directory.Build.props EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EnvironmentPipeline", "addons\EnvironmentPipeline\EnvironmentPipeline.csproj", "{F04C3F79-2E08-4D35-A804-43039DCB7F5E}" @@ -25,9 +26,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VkvgPipeline", "addons\Vkvg EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{16439374-B8DB-4643-8116-EB3358B49A12}" ProjectSection(SolutionItems) = preProject - samples/Directory.Build.props = "Directory.Build.props" + samples\Directory.Build.props = samples\Directory.Build.props EndProjectSection EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ClearScreen", "samples\ClearScreen\ClearScreen.csproj", "{1D2A1968-8F04-4BE0-B03A-573F1F68AB66}" +EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Triangle", "samples\Triangle\Triangle.csproj", "{124152F8-FAE6-4D4B-87B9-6074DD365E9B}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Textured", "samples\Textured\Textured.csproj", "{1B2DF710-E500-49E5-8802-EBA71A05E827}" @@ -159,6 +162,16 @@ Global {7EB2430B-6BC0-4AE9-B1FA-57C3DB2AE1C5}.DebugCrow|Any CPU.Build.0 = Debug|Any CPU {7EB2430B-6BC0-4AE9-B1FA-57C3DB2AE1C5}.Release|Any CPU.Build.0 = Release|Any CPU {7EB2430B-6BC0-4AE9-B1FA-57C3DB2AE1C5}.BuildPackages|Any CPU.ActiveCfg = Release|Any CPU + {1D2A1968-8F04-4BE0-B03A-573F1F68AB66}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1D2A1968-8F04-4BE0-B03A-573F1F68AB66}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1D2A1968-8F04-4BE0-B03A-573F1F68AB66}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1D2A1968-8F04-4BE0-B03A-573F1F68AB66}.Release|Any CPU.Build.0 = Release|Any CPU + {1D2A1968-8F04-4BE0-B03A-573F1F68AB66}.DebugCrow|Any CPU.ActiveCfg = Debug|Any CPU + {1D2A1968-8F04-4BE0-B03A-573F1F68AB66}.DebugCrow|Any CPU.Build.0 = Debug|Any CPU + {1D2A1968-8F04-4BE0-B03A-573F1F68AB66}.ReleaseSpirVTasks|Any CPU.ActiveCfg = Debug|Any CPU + {1D2A1968-8F04-4BE0-B03A-573F1F68AB66}.ReleaseSpirVTasks|Any CPU.Build.0 = Debug|Any CPU + {1D2A1968-8F04-4BE0-B03A-573F1F68AB66}.BuildPackages|Any CPU.ActiveCfg = Release|Any CPU + {1D2A1968-8F04-4BE0-B03A-573F1F68AB66}.BuildPackages|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(NestedProjects) = preSolution {FEF3AF30-5B88-4D3C-8BD7-8734200E0D1E} = {4AA67AB0-C331-4CB2-9C00-B74F5DE31658} @@ -173,6 +186,7 @@ Global {D9A41382-444E-44ED-B638-3D8F06F2FBC2} = {16439374-B8DB-4643-8116-EB3358B49A12} {124152F8-FAE6-4D4B-87B9-6074DD365E9B} = {16439374-B8DB-4643-8116-EB3358B49A12} {7EB2430B-6BC0-4AE9-B1FA-57C3DB2AE1C5} = {16439374-B8DB-4643-8116-EB3358B49A12} + {1D2A1968-8F04-4BE0-B03A-573F1F68AB66} = {16439374-B8DB-4643-8116-EB3358B49A12} EndGlobalSection GlobalSection(MonoDevelopProperties) = preSolution Policies = $0 diff --git a/vke/src/VkWindow.cs b/vke/src/VkWindow.cs index e2e2fb4..acb23eb 100644 --- a/vke/src/VkWindow.cs +++ b/vke/src/VkWindow.cs @@ -35,7 +35,7 @@ namespace vke { protected CommandPool cmdPool; protected CommandBuffer[] cmds; protected VkSemaphore[] drawComplete; - protected VkFence drawFence; + protected Fence drawFence; protected uint fps { get; private set; } protected bool updateViewRequested = true; @@ -173,7 +173,7 @@ namespace vke { cmds = new CommandBuffer[swapChain.ImageCount]; drawComplete = new VkSemaphore[swapChain.ImageCount]; - drawFence = dev.CreateFence (true); + drawFence = new Fence (dev, true, "draw fence"); for (int i = 0; i < swapChain.ImageCount; i++) { drawComplete[i] = dev.CreateSemaphore (); @@ -218,8 +218,8 @@ namespace vke { if (cmds[idx] == null) return; - dev.WaitForFence (drawFence); - dev.ResetFence (drawFence); + drawFence.Wait (); + drawFence.Reset (); presentQueue.Submit (cmds[idx], swapChain.presentComplete, drawComplete[idx], drawFence); presentQueue.Present (swapChain, drawComplete[idx]); @@ -393,8 +393,7 @@ namespace vke { dev.DestroySemaphore (drawComplete[i]); cmds[i].Free (); } - dev.DestroyFence (drawFence); - + drawFence.Dispose (); swapChain.Dispose (); vkDestroySurfaceKHR (instance.Handle, hSurf, IntPtr.Zero); diff --git a/vke/src/base/Activable.cs b/vke/src/base/Activable.cs index 5fc2a99..2f7edf5 100644 --- a/vke/src/base/Activable.cs +++ b/vke/src/base/Activable.cs @@ -41,7 +41,8 @@ namespace vke { //With the debug utils extension, setting name to vulkan's object ease the debugging. protected string name; ///

- /// This property has to be implemented in every vulkan object. It must return the correct debug marker info. + /// This property has to be implemented in every vulkan object. It must return the correct debug marker info to use + /// if VK_EXT_debug_utils extension is enabled. /// /// The debug marker info. protected abstract VkDebugUtilsObjectNameInfoEXT DebugUtilsInfo { get; } @@ -52,11 +53,11 @@ namespace vke { #region CTOR protected Activable (Device dev) { - this.Dev = dev; - this.name = GetType ().Name; + Dev = dev; + name = GetType ().Name; } protected Activable (Device dev, string name) { - this.Dev = dev; + Dev = dev; this.name = name; } #endregion @@ -76,7 +77,7 @@ namespace vke { name.Unpin (); } /// - /// Activation of the object, the reference count is incremented. + /// Activation of the object, the reference count is incremented and if Debug utils is enabled, name is set. /// public virtual void Activate () { references++; diff --git a/vke/src/base/Buffer.cs b/vke/src/base/Buffer.cs index 9a86f14..aa25004 100644 --- a/vke/src/base/Buffer.cs +++ b/vke/src/base/Buffer.cs @@ -7,33 +7,45 @@ using static Vulkan.Vk; namespace vke { - /// - /// Base class for HostBuffer and GPUBuffer - /// - public class Buffer : Resource { - internal VkBuffer handle; + /// + /// Base class for managed vulkan buffer objects + /// + public class Buffer : Resource { + internal VkBuffer handle; protected VkBufferCreateInfo createInfo = VkBufferCreateInfo.New (); - - public VkDescriptorBufferInfo Descriptor; + /// Native handle of this vulkan buffer. + /// The handle. public VkBuffer Handle => handle; public VkBufferCreateInfo Infos => createInfo; + /// Buffer memory is always linear. public override bool IsLinar => true; protected override VkDebugUtilsObjectNameInfoEXT DebugUtilsInfo => new VkDebugUtilsObjectNameInfoEXT (VkObjectType.Buffer, handle.Handle); #region CTORS - public Buffer (Device device, VkBufferUsageFlags usage, VkMemoryPropertyFlags _memoryPropertyFlags, UInt64 size) - : base (device, _memoryPropertyFlags) { - - createInfo.size = size; - createInfo.usage = usage; - createInfo.sharingMode = VkSharingMode.Exclusive; - - Activate ();//DONT OVERRIDE Activate in derived classes!!!! - } + /// + /// Create a vulkan buffer and automatically activate it. Automatic activation on startup implies to explicitly dispose the buffer. + /// + /// Logical Device. + /// a bitmask specifying allowed usages of the buffer + /// Memory property flags. + /// Desired size in byte of the buffer to be created. + /// value specifying the sharing mode of the buffer when it will be accessed by multiple queue familie + public Buffer (Device device, VkBufferUsageFlags usage, VkMemoryPropertyFlags _memoryPropertyFlags, UInt64 size, VkSharingMode sharingMode = VkSharingMode.Exclusive) + : base (device, _memoryPropertyFlags) { + + createInfo.size = size; + createInfo.usage = usage; + createInfo.sharingMode = VkSharingMode.Exclusive; + + Activate (); + } #endregion - public override void Activate () { + /// + /// Activate this vulkan buffer. Note that buffers are automatically activated on creation. + /// + public sealed override void Activate () { if (state != ActivableState.Activated) { Utils.CheckResult (vkCreateBuffer (Dev.VkDev, ref createInfo, IntPtr.Zero, out handle)); #if MEMORY_POOLS @@ -43,11 +55,11 @@ namespace vke { allocateMemory (); bindMemory (); #endif - SetupDescriptor (); } base.Activate (); - } + } + #region Implement abstract members of the Resource abstract class. internal override void updateMemoryRequirements () { vkGetBufferMemoryRequirements (Dev.VkDev, handle, out memReqs); } @@ -59,49 +71,84 @@ namespace vke { Utils.CheckResult (vkBindBufferMemory (Dev.VkDev, handle, vkMemory, 0)); #endif } + #endregion - public void SetupDescriptor (ulong size = WholeSize, ulong offset = 0) { - Descriptor.buffer = handle; - Descriptor.range = size; - Descriptor.offset = offset; - } - - public void CopyTo (CommandBuffer cmd, Image img, VkImageLayout finalLayout = VkImageLayout.ShaderReadOnlyOptimal) { - img.SetLayout (cmd, VkImageAspectFlags.Color, VkImageLayout.TransferDstOptimal); - - VkBufferImageCopy bufferCopyRegion = new VkBufferImageCopy { - imageExtent = img.CreateInfo.extent, - imageSubresource = new VkImageSubresourceLayers(VkImageAspectFlags.Color) - }; - - vkCmdCopyBufferToImage (cmd.Handle, handle, img.handle, VkImageLayout.TransferDstOptimal, 1, ref bufferCopyRegion); + /// + /// Get a default buffer descriptor for the full size with no offset. + /// + /// the vulkan buffer descriptor + public VkDescriptorBufferInfo Descriptor { get => GetDescriptor (); } + /// + /// Get a buffer descriptor. + /// + /// a vulkan buffer descriptor + /// Size in byte of the buffer view + /// an offset in the buffer memory at which point this descriptor. + public VkDescriptorBufferInfo GetDescriptor (ulong size = WholeSize, ulong offset = 0) => + new VkDescriptorBufferInfo { buffer = handle, range = size, offset = offset }; + + /// + /// Copy a vulkan buffer to an Image. + /// + /// a command buffer to handle the operation. + /// The Image to copy the buffer to. + /// The final layout to setup for the destination image. + public void CopyTo (CommandBuffer cmd, Image img, VkImageLayout finalLayout = VkImageLayout.ShaderReadOnlyOptimal) { + img.SetLayout (cmd, VkImageAspectFlags.Color, VkImageLayout.TransferDstOptimal); + + VkBufferImageCopy bufferCopyRegion = new VkBufferImageCopy { + imageExtent = img.CreateInfo.extent, + imageSubresource = new VkImageSubresourceLayers (VkImageAspectFlags.Color) + }; + + vkCmdCopyBufferToImage (cmd.Handle, handle, img.handle, VkImageLayout.TransferDstOptimal, 1, ref bufferCopyRegion); img.SetLayout (cmd, VkImageAspectFlags.Color, finalLayout); } - public void CopyTo (CommandBuffer cmd, Buffer buff, ulong size = 0, ulong srcOffset = 0, ulong dstOffset = 0) { - VkBufferCopy bufferCopy = new VkBufferCopy { - size = (size == 0) ? AllocatedDeviceMemorySize : size, - srcOffset = srcOffset, - dstOffset = dstOffset - }; - vkCmdCopyBuffer (cmd.Handle, handle, buff.handle, 1, ref bufferCopy); - } + /// + /// Copy a vulkan buffer to another buffer. + /// + /// a command buffer to handle the operation. + /// the destination buffer. + /// size of the copy operation in byte. + /// a source offset for the copy operation. + /// an offset in the destination buffer for the copy operation. + public void CopyTo (CommandBuffer cmd, Buffer buff, ulong size = 0, ulong srcOffset = 0, ulong dstOffset = 0) { + VkBufferCopy bufferCopy = new VkBufferCopy { + size = (size == 0) ? AllocatedDeviceMemorySize : size, + srcOffset = srcOffset, + dstOffset = dstOffset + }; + vkCmdCopyBuffer (cmd.Handle, handle, buff.handle, 1, ref bufferCopy); + } + /// + /// Fill a vulkan buffer memory with an unsinged integer value. + /// + /// a command buffer to handle the operation. + /// an unsigned integer to fill the buffer with. + /// size in byte to fill. + /// an offset in byte in the buffer for the fill operation. public void Fill (CommandBuffer cmd, uint data, ulong size = 0, ulong offset = 0) { vkCmdFillBuffer (cmd.Handle, handle, offset, (size == 0) ? AllocatedDeviceMemorySize : size, data); } public override string ToString () { - return string.Format ($"{base.ToString ()}[0x{handle.Handle.ToString("x")}]"); + return string.Format ($"{base.ToString ()}[0x{handle.Handle.ToString ("x")}]"); } -#region IDisposable Support + #region IDisposable Support + /// + /// Destroy the native handle and set the Activable's state to `Disposed`. + /// + /// Note that Buffers have to be always explicitly disposed on cleanup. + /// If set to true, this object is currently disposed by the user, not the finalizer. protected override void Dispose (bool disposing) { if (state == ActivableState.Activated) { base.Dispose (disposing); vkDestroyBuffer (Dev.VkDev, handle, IntPtr.Zero); } state = ActivableState.Disposed; - } -#endregion + } + #endregion } } diff --git a/vke/src/base/CommandBuffer.cs b/vke/src/base/CommandBuffer.cs index 9c65dc1..ef85867 100644 --- a/vke/src/base/CommandBuffer.cs +++ b/vke/src/base/CommandBuffer.cs @@ -33,8 +33,14 @@ namespace vke { //State = States.Init; } - - public void Submit (VkQueue queue, VkSemaphore wait = default(VkSemaphore), VkSemaphore signal = default (VkSemaphore), VkFence fence = default(VkFence)) { + /// + /// Submit an executable command buffer with optional wait and signal semaphores, and an optional fence to be signaled when the commands have been completed. + /// + /// Queue. + /// Wait. + /// Signal. + /// Fence. + public void Submit (VkQueue queue, VkSemaphore wait = default, VkSemaphore signal = default, Fence fence = null) { VkSubmitInfo submit_info = VkSubmitInfo.New(); IntPtr dstStageMask = Marshal.AllocHGlobal (sizeof(uint)); @@ -58,10 +64,17 @@ namespace vke { } Marshal.FreeHGlobal (dstStageMask); } + /// + /// Put the command buffer in the recording state. + /// + /// optional command buffer usage flags. public void Start (VkCommandBufferUsageFlags usage = 0) { VkCommandBufferBeginInfo cmdBufInfo = new VkCommandBufferBeginInfo (usage); Utils.CheckResult (vkBeginCommandBuffer (handle, ref cmdBufInfo)); } + /// + /// Put the command buffer in the executable state if no errors are present in the recording. + /// public void End () { Utils.CheckResult (vkEndCommandBuffer (handle)); } diff --git a/vke/src/base/DescriptorPool.cs b/vke/src/base/DescriptorPool.cs index 26339f5..2970257 100644 --- a/vke/src/base/DescriptorPool.cs +++ b/vke/src/base/DescriptorPool.cs @@ -3,7 +3,6 @@ // This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) using System; using System.Collections.Generic; -using System.Xml.Serialization; using Vulkan; using static Vulkan.Vk; @@ -11,20 +10,28 @@ namespace vke { [Serializable] public sealed class DescriptorPool : Activable { internal VkDescriptorPool handle; - [XmlAttribute] public uint MaxSets; - [XmlArrayItem("PoolSize")] - - public List PoolSizes = new List (); + public List PoolSizes { get; private set; } = new List (); protected override VkDebugUtilsObjectNameInfoEXT DebugUtilsInfo => new VkDebugUtilsObjectNameInfoEXT (VkObjectType.DescriptorPool, handle.Handle); #region CTORS DescriptorPool () : base (null) {} + /// + /// Create a new managed descriptor pool that will be manualy activated after the pool sizes had been populated. + /// + /// the logical device that create the pool. + /// maximum number of descriptor sets that can be allocated from the pool public DescriptorPool (Device device, uint maxSets = 1) : base (device) { MaxSets = maxSets; } + /// + /// Create and automatically activate a new Descriptor pool with the supplied pool sizes. + /// + /// the logical device that create the pool. + /// maximum number of descriptor sets that can be allocated from the pool + /// an array of pool sizes describing descriptor types and counts public DescriptorPool (Device device, uint maxSets = 1, params VkDescriptorPoolSize[] poolSizes) : this (device, maxSets) { @@ -34,7 +41,7 @@ namespace vke { } #endregion - public override void Activate () { + public sealed override void Activate () { if (state != ActivableState.Activated) { VkDescriptorPoolCreateInfo info = VkDescriptorPoolCreateInfo.New(); info.poolSizeCount = (uint)PoolSizes.Count; @@ -46,11 +53,12 @@ namespace vke { } base.Activate (); } - - /// - /// Create and allocate a new DescriptorSet - /// - public DescriptorSet Allocate (params DescriptorSetLayout[] layouts) { + /// + /// Allocate a new DescriptorSet from this pool. + /// + /// A managed descriptor set. + /// a variable sized array of descriptor layout(s) to allocate the descriptor for. + public DescriptorSet Allocate (params DescriptorSetLayout[] layouts) { DescriptorSet ds = new DescriptorSet (this, layouts); Allocate (ds); return ds; diff --git a/vke/src/base/DescriptorSet.cs b/vke/src/base/DescriptorSet.cs index 80c583d..8df8be5 100644 --- a/vke/src/base/DescriptorSet.cs +++ b/vke/src/base/DescriptorSet.cs @@ -3,7 +3,7 @@ // This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) using System.Collections.Generic; using Vulkan; - +//TODO: namespace vke { public class DescriptorSet { internal VkDescriptorSet handle; diff --git a/vke/src/base/Device.cs b/vke/src/base/Device.cs index 56e38fe..65aff0f 100644 --- a/vke/src/base/Device.cs +++ b/vke/src/base/Device.cs @@ -97,7 +97,10 @@ namespace vke { resourceManager = new ResourceManager (this); #endif } - + /// + /// Creates a new semaphore. + /// + /// The semaphore native handle public VkSemaphore CreateSemaphore () { VkSemaphore tmp; VkSemaphoreCreateInfo info = VkSemaphoreCreateInfo.New (); @@ -108,38 +111,14 @@ namespace vke { vkDestroySemaphore (dev, semaphore, IntPtr.Zero); semaphore = 0; } - public VkFence CreateFence (bool signaled = false) { - VkFence tmp; - VkFenceCreateInfo info = VkFenceCreateInfo.New (); - info.flags = signaled ? VkFenceCreateFlags.Signaled : 0; - Utils.CheckResult (vkCreateFence (dev, ref info, IntPtr.Zero, out tmp)); - return tmp; - } - /// Destroy the fence. - /// A valid fence handle. - public void DestroyFence (VkFence fence) { - vkDestroyFence (dev, fence, IntPtr.Zero); - fence = 0; - } - public void WaitForFence (VkFence fence, ulong timeOut = UInt64.MaxValue) { - vkWaitForFences (dev, 1, ref fence, 1, timeOut); - } - public void ResetFence (VkFence fence) { - vkResetFences (dev, 1, ref fence); - } - public void WaitForFences (VkFence[] fences, ulong timeOut = UInt64.MaxValue) { - vkWaitForFences (dev, (uint)fences.Length, fences.Pin(), 1, timeOut); - fences.Unpin (); - } - public void ResetFences (params VkFence[] fences) { - vkResetFences (dev, (uint)fences.Length, fences.Pin()); - fences.Unpin (); - } public void DestroyShaderModule (VkShaderModule module) { vkDestroyShaderModule (VkDev, module, IntPtr.Zero); module = 0; } + /// + /// Wait for this logical device to enter the idle state. + /// public void WaitIdle () { Utils.CheckResult (vkDeviceWaitIdle (dev)); } @@ -148,27 +127,8 @@ namespace vke { Utils.CheckResult (vkCreateRenderPass (dev, ref info, IntPtr.Zero, out renderPass)); return renderPass; } - internal VkSwapchainKHR CreateSwapChain (VkSwapchainCreateInfoKHR infos) { - VkSwapchainKHR newSwapChain; - Utils.CheckResult (vkCreateSwapchainKHR (dev, ref infos, IntPtr.Zero, out newSwapChain)); - return newSwapChain; - } - internal void DestroySwapChain (VkSwapchainKHR swapChain) { - vkDestroySwapchainKHR (dev, swapChain, IntPtr.Zero); - } - unsafe public VkImage[] GetSwapChainImages (VkSwapchainKHR swapchain) { - uint imageCount = 0; - Utils.CheckResult (vkGetSwapchainImagesKHR (dev, swapchain, out imageCount, IntPtr.Zero)); - if (imageCount == 0) - throw new Exception ("Swapchain image count is 0."); - VkImage[] imgs = new VkImage[imageCount]; - - Utils.CheckResult (vkGetSwapchainImagesKHR (dev, swapchain, out imageCount, imgs.Pin ())); - imgs.Unpin (); - return imgs; - } - unsafe public VkImageView CreateImageView (VkImage image, VkFormat format, VkImageViewType viewType = VkImageViewType.ImageView2D, VkImageAspectFlags aspectFlags = VkImageAspectFlags.Color) { + public VkImageView CreateImageView (VkImage image, VkFormat format, VkImageViewType viewType = VkImageViewType.ImageView2D, VkImageAspectFlags aspectFlags = VkImageAspectFlags.Color) { VkImageView view; VkImageViewCreateInfo infos = VkImageViewCreateInfo.New (); infos.image = image; diff --git a/vke/src/base/Fence.cs b/vke/src/base/Fence.cs new file mode 100644 index 0000000..0eb031a --- /dev/null +++ b/vke/src/base/Fence.cs @@ -0,0 +1,82 @@ +// Copyright (c) 2020 Jean-Philippe Bruyère +// +// This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) +using System; +using System.Collections.ObjectModel; +using System.Linq; +using Vulkan; +using static Vulkan.Vk; + +namespace vke { + /// + /// Managed activable fence. + /// + public class Fence : Activable { + internal VkFence handle; + VkFenceCreateInfo info = VkFenceCreateInfo.New (); + + public Fence (Device dev, bool signaled = false, string name = "fence") : base (dev, name) { + info.flags = signaled ? VkFenceCreateFlags.Signaled : 0; + Activate (); + } + + protected override VkDebugUtilsObjectNameInfoEXT DebugUtilsInfo + => new VkDebugUtilsObjectNameInfoEXT (VkObjectType.Framebuffer, handle.Handle); + + public sealed override void Activate () { + if (state != ActivableState.Activated) { + Utils.CheckResult (vkCreateFence (Dev.VkDev, ref info, IntPtr.Zero, out handle)); + } + base.Activate (); + } + /// + /// Wait this fence to become signaled. + /// + /// Time out before cancelling the wait. + public void Wait (ulong timeOut = UInt64.MaxValue) { + vkWaitForFences (Dev.VkDev, 1, ref handle, 1, timeOut); + } + /// + /// put this fence in the unsignaled state. + /// + public void Reset () { + vkResetFences (Dev.VkDev, 1, ref handle); + } + + public override string ToString () { + return string.Format ($"{base.ToString ()}[0x{handle.Handle.ToString ("x")}]"); + } + + public static implicit operator VkFence (Fence f) => f == null ? 0 : f.handle; + + #region IDisposable Support + protected override void Dispose (bool disposing) { + if (state == ActivableState.Activated) + vkDestroyFence (Dev.VkDev, handle, IntPtr.Zero); + if (!disposing) + System.Diagnostics.Debug.WriteLine ("VKE Activable object disposed by finalizer"); + base.Dispose (disposing); + } + #endregion + } + + + public class Fences : Collection, IDisposable { + public void Wait (ulong timeOut = UInt64.MaxValue) { + VkFence[] fences = Items.Cast ().ToArray (); + vkWaitForFences (Items[0].Dev.VkDev, (uint)Count, fences.Pin (), 1, timeOut); + fences.Unpin (); + } + public void Reset () { + VkFence[] fences = Items.Cast ().ToArray (); + vkResetFences (Items[0].Dev.VkDev, (uint)Count, fences.Pin ()); + fences.Unpin (); + } + + public void Dispose () { + foreach (Fence f in Items) + f.Dispose (); + ClearItems (); + } + } +} diff --git a/vke/src/base/FrameBuffer.cs b/vke/src/base/FrameBuffer.cs index 94a69b9..82f214e 100644 --- a/vke/src/base/FrameBuffer.cs +++ b/vke/src/base/FrameBuffer.cs @@ -10,27 +10,30 @@ using static Vulkan.Vk; namespace vke { - public class FrameBuffer : Activable { - internal VkFramebuffer handle; - RenderPass renderPass; - + /// + /// Managed activable for one Frame buffer + /// + public class FrameBuffer : Activable { + internal VkFramebuffer handle; + RenderPass renderPass; + public List attachments = new List (); - VkFramebufferCreateInfo createInfo = VkFramebufferCreateInfo.New(); + VkFramebufferCreateInfo createInfo = VkFramebufferCreateInfo.New (); - public uint Width => createInfo.width; - public uint Height => createInfo.height; - public uint Layers => createInfo.layers; + public uint Width => createInfo.width; + public uint Height => createInfo.height; + public uint Layers => createInfo.layers; protected override VkDebugUtilsObjectNameInfoEXT DebugUtilsInfo => new VkDebugUtilsObjectNameInfoEXT (VkObjectType.Framebuffer, handle.Handle); #region CTORS - public FrameBuffer (RenderPass _renderPass, uint _width, uint _height, uint _layers = 1) : base(_renderPass.Dev) { - renderPass = _renderPass; - createInfo.width = _width; - createInfo.height = _height; - createInfo.layers = _layers; - createInfo.renderPass = renderPass.handle; - } + public FrameBuffer (RenderPass _renderPass, uint _width, uint _height, uint _layers = 1) : base (_renderPass.Dev) { + renderPass = _renderPass; + createInfo.width = _width; + createInfo.height = _height; + createInfo.layers = _layers; + createInfo.renderPass = renderPass.handle; + } /// /// Create and Activate a new frabuffer for the supplied RenderPass. /// @@ -39,7 +42,7 @@ namespace vke { /// Height. /// Views. public FrameBuffer (RenderPass _renderPass, uint _width, uint _height, params Image[] views) - : this (_renderPass, _width, _height) { + : this (_renderPass, _width, _height) { for (int i = 0; i < views.Length; i++) { Image v = views[i]; if (v == null) { @@ -61,13 +64,13 @@ namespace vke { } else v.Activate ();//increase ref and create handle if not already activated - attachments.Add (v); + attachments.Add (v); } - Activate (); + Activate (); } #endregion - public override void Activate () { + public sealed override void Activate () { if (state != ActivableState.Activated) { VkImageView[] views = attachments.Select (a => a.Descriptor.imageView).ToArray (); createInfo.attachmentCount = (uint)views.Length; @@ -78,26 +81,26 @@ namespace vke { views.Unpin (); } base.Activate (); - } + } public override string ToString () { - return string.Format ($"{base.ToString ()}[0x{handle.Handle.ToString("x")}]"); + return string.Format ($"{base.ToString ()}[0x{handle.Handle.ToString ("x")}]"); } -#region IDisposable Support + #region IDisposable Support protected override void Dispose (bool disposing) { if (state == ActivableState.Activated) Dev.DestroyFramebuffer (handle); if (disposing) { - foreach (Image img in attachments) - img.Dispose(); - }else + foreach (Image img in attachments) + img.Dispose (); + } else System.Diagnostics.Debug.WriteLine ("VKE Activable object disposed by finalizer"); - + base.Dispose (disposing); } -#endregion + #endregion } } diff --git a/vke/src/base/GPUBuffer.cs b/vke/src/base/GPUBuffer.cs index 50280ba..d5e1c7c 100644 --- a/vke/src/base/GPUBuffer.cs +++ b/vke/src/base/GPUBuffer.cs @@ -16,17 +16,32 @@ namespace vke { } } /// - /// Device local Buffer + /// Device local Buffer for an array of elements of type T. /// public class GPUBuffer : GPUBuffer { - + /// + /// return the current element count of this buffer. + /// public int ElementCount { get; private set; } + /// + /// Create an empty new device local buffer with the size needed to store the specified item count of type T. + /// + /// the logical device that will create this buffer. + /// bitmask of the intended usages for this buffer + /// Element count of type T to reserve the space for. public GPUBuffer (Device device, VkBufferUsageFlags usage, int elementCount) : base (device, usage, (ulong)(Marshal.SizeOf () * elementCount)) { ElementCount = elementCount; } - public GPUBuffer (Queue staggingQ, CommandPool staggingCmdPool, VkBufferUsageFlags usage, T[] elements) + /// + /// Create and polulate by copy a new device local buffer. + /// + /// The managed queue that will be used for the copy of the elements from a temporary stagging buffer to the final device buffer. + /// A command pool for the supplied queue. + /// bitmask of the intended usages for this buffer + /// an array of elements of type T to populate the new device buffer with. + public GPUBuffer (Queue staggingQ, CommandPool staggingCmdPool, VkBufferUsageFlags usage, T[] elements) : base (staggingQ.Dev, usage | VkBufferUsageFlags.TransferDst, (ulong)(Marshal.SizeOf () * elements.Length)) { using (HostBuffer stagging = new HostBuffer (Dev, VkBufferUsageFlags.TransferSrc, elements)) { CommandBuffer cmd = staggingCmdPool.AllocateCommandBuffer (); diff --git a/vke/src/base/GraphicPipeline.cs b/vke/src/base/GraphicPipeline.cs index c538501..6658cc1 100644 --- a/vke/src/base/GraphicPipeline.cs +++ b/vke/src/base/GraphicPipeline.cs @@ -8,20 +8,25 @@ using System.Linq; using static Vulkan.Vk; namespace vke { - public class GraphicPipeline : Pipeline { + public class GraphicPipeline : Pipeline { public readonly RenderPass RenderPass; public VkSampleCountFlags Samples => RenderPass.Samples; #region CTORS - protected GraphicPipeline (RenderPass renderPass, PipelineCache cache = null, string name = "graphic pipeline") : base(renderPass.Dev, cache, name) { + /// + /// Create and activate a new pipeline for supplied render pass. + /// + /// a managed Render pass that will be activated (if not already) during the pipeline creation. + /// an optional pipeline cache to speed up pipeline creation. + /// an optionnal name that will be used by the debug utils extension if enabled. + protected GraphicPipeline (RenderPass renderPass, PipelineCache cache = null, string name = "graphic pipeline") : base (renderPass.Dev, cache, name) { RenderPass = renderPass; } /// /// Create a new Pipeline with supplied RenderPass /// - public GraphicPipeline (GraphicPipelineConfig cfg, string name = "graphic pipeline") : this (cfg.RenderPass, cfg.Cache, name) - { + public GraphicPipeline (GraphicPipelineConfig cfg, string name = "graphic pipeline") : this (cfg.RenderPass, cfg.Cache, name) { layout = cfg.Layout; init (cfg); @@ -46,8 +51,7 @@ namespace vke { VkPipelineColorBlendStateCreateInfo colorBlendInfo = VkPipelineColorBlendStateCreateInfo.New (); colorBlendInfo.logicOpEnable = cfg.ColorBlendLogicOpEnable; colorBlendInfo.logicOp = cfg.ColorBlendLogicOp; - unsafe - { + unsafe { colorBlendInfo.blendConstants[0] = cfg.ColorBlendConstants.X; colorBlendInfo.blendConstants[1] = cfg.ColorBlendConstants.Y; colorBlendInfo.blendConstants[2] = cfg.ColorBlendConstants.Z; @@ -58,7 +62,7 @@ namespace vke { VkPipelineDynamicStateCreateInfo dynStatesInfo = VkPipelineDynamicStateCreateInfo.New (); dynStatesInfo.dynamicStateCount = (uint)cfg.dynamicStates.Count; - dynStatesInfo.pDynamicStates = cfg.dynamicStates.Cast().ToArray().Pin (pctx); + dynStatesInfo.pDynamicStates = cfg.dynamicStates.Cast ().ToArray ().Pin (pctx); VkPipelineVertexInputStateCreateInfo vertInputInfo = VkPipelineVertexInputStateCreateInfo.New (); vertInputInfo.vertexBindingDescriptionCount = (uint)cfg.vertexBindings.Count; @@ -97,7 +101,7 @@ namespace vke { Utils.CheckResult (vkCreateGraphicsPipelines (Dev.VkDev, Cache == null ? VkPipelineCache.Null : Cache.handle, 1, ref info, IntPtr.Zero, out handle)); for (int i = 0; i < cfg.shaders.Count; i++) - Dev.DestroyShaderModule (shaderStages [i].module); + Dev.DestroyShaderModule (shaderStages[i].module); } } base.Activate (); @@ -112,9 +116,9 @@ namespace vke { protected override void Dispose (bool disposing) { if (disposing) { - if (state == ActivableState.Activated) + if (state == ActivableState.Activated) RenderPass.Dispose (); - }else + } else System.Diagnostics.Debug.WriteLine ("GraphicPipeline disposed by finalizer"); base.Dispose (disposing); diff --git a/vke/src/base/HostBuffer.cs b/vke/src/base/HostBuffer.cs index 2ce0094..f61cb84 100644 --- a/vke/src/base/HostBuffer.cs +++ b/vke/src/base/HostBuffer.cs @@ -8,80 +8,144 @@ using Vulkan; using static Vulkan.Vk; namespace vke { - + /// + /// Host visible mappable buffer to handle array of blittable type T + /// public class HostBuffer : HostBuffer { - int TSize; - + int TSize; + /// + /// Create an empty mappable vulkan buffer for elements of type T whith specified size. + /// + /// Logical Device. + /// Buffer Usage. + /// Array element count. + /// If set to true, buffer will stay mapped after the constructor. + /// If set to true vulkan memory with have the coherent flag. public HostBuffer (Device device, VkBufferUsageFlags usage, uint arrayElementCount, bool keepMapped = false, bool coherentMem = true) - : base (device, usage, (ulong)(Marshal.SizeOf () * arrayElementCount), keepMapped, coherentMem) { - TSize = Marshal.SizeOf(); - } + : base (device, usage, (ulong)(Marshal.SizeOf () * arrayElementCount), keepMapped, coherentMem) { + TSize = Marshal.SizeOf (); + } + /// + /// Create and populate a mappable vulkan buffer. + /// + /// Logical Device. + /// Buffer Usage. + /// a list of T implementing the IList interface which will be used to populate the buffer. + /// If set to true, buffer will stay mapped after the constructor. + /// If set to true vulkan memory with have the coherent flag. public HostBuffer (Device device, VkBufferUsageFlags usage, IList data, bool keepMapped = false, bool coherentMem = true) - : base (device, usage, (ulong)(Marshal.SizeOf () * data.Count), keepMapped, coherentMem) { - TSize = Marshal.SizeOf(); - Map(); - Update (data, createInfo.size); + : base (device, usage, (ulong)(Marshal.SizeOf () * data.Count), keepMapped, coherentMem) { + TSize = Marshal.SizeOf (); + Map (); + Update (data, createInfo.size); if (!keepMapped) - Unmap (); - } - public HostBuffer (Device device, VkBufferUsageFlags usage, T[] data, bool keepMapped = false, bool coherentMem = true) - : base (device, usage, (ulong)(Marshal.SizeOf () * data.Length), keepMapped, coherentMem) { - TSize = Marshal.SizeOf(); - Map(); - Update (data, createInfo.size); + Unmap (); + } + /// + /// Create and populate a mappable vulkan buffer. + /// + /// Logical Device. + /// Buffer Usage. + /// an array of T which will be used to populate the buffer. + /// If set to true, buffer will stay mapped after the constructor. + /// If set to true vulkan memory with have the coherent flag. + public HostBuffer (Device device, VkBufferUsageFlags usage, T[] data, bool keepMapped = false, bool coherentMem = true) + : base (device, usage, (ulong)(Marshal.SizeOf () * data.Length), keepMapped, coherentMem) { + TSize = Marshal.SizeOf (); + Map (); + Update (data, createInfo.size); if (!keepMapped) - Unmap (); - } + Unmap (); + } + /// + /// Update content of the buffer with array of given length with no offset. + /// + /// Data. public void Update (T[] data) { Update (data, (ulong)(TSize * data.Length)); } - public void Update (uint index, T data) { - GCHandle ptr = GCHandle.Alloc(data, GCHandleType.Pinned); - unsafe { - System.Buffer.MemoryCopy(ptr.AddrOfPinnedObject().ToPointer(), (mappedData + (int)(TSize*index)).ToPointer(), TSize, TSize); - } - ptr.Free(); - } - public void Flush (uint startIndex, uint endIndex) { - VkMappedMemoryRange mr = new VkMappedMemoryRange - { - sType = VkStructureType.MappedMemoryRange, + /// + /// Update a single T element in the buffer at specified index. + /// + /// 0 based index of the T element in the array. + /// new value for T to set in the buffer. + public void Update (uint index, T data) { + GCHandle ptr = GCHandle.Alloc (data, GCHandleType.Pinned); + unsafe { + System.Buffer.MemoryCopy (ptr.AddrOfPinnedObject ().ToPointer (), (mappedData + (int)(TSize * index)).ToPointer (), TSize, TSize); + } + ptr.Free (); + } + /// + /// Flush memory, note that coherent memory desn't need it. + /// + /// index of the first T element to flush + /// index of the last T element to flush + public void Flush (uint startIndex, uint endIndex) { + //TODO: vulkan has some alignement constrains on flushing! + VkMappedMemoryRange mr = new VkMappedMemoryRange { + sType = VkStructureType.MappedMemoryRange, #if MEMORY_POOLS memory = memoryPool.vkMemory, - offset = poolOffset + (ulong)(startIndex * TSize), + offset = poolOffset + (ulong)(startIndex * TSize), #else memory = vkMemory, offset = (ulong)(startIndex * TSize), #endif - size = (ulong)((endIndex - startIndex) * TSize) - }; - vkFlushMappedMemoryRanges(Dev.VkDev, 1, ref mr); - } - } + size = (ulong)((endIndex - startIndex) * TSize) + }; + vkFlushMappedMemoryRanges (Dev.VkDev, 1, ref mr); + } + } /// /// Mappable Buffer with HostVisble and HostCoherent memory flags /// public class HostBuffer : Buffer { - public HostBuffer (Device device, VkBufferUsageFlags usage, UInt64 size, bool keepMapped = false, bool coherentMem = true) - : base (device, usage, coherentMem ? VkMemoryPropertyFlags.HostVisible | VkMemoryPropertyFlags.HostCoherent : VkMemoryPropertyFlags.HostVisible, size) { - if (keepMapped) - Map(); - } - public HostBuffer (Device device, VkBufferUsageFlags usage, object data, bool keepMapped = false, bool coherentMem = true) - : base (device, usage, coherentMem ? VkMemoryPropertyFlags.HostVisible | VkMemoryPropertyFlags.HostCoherent : VkMemoryPropertyFlags.HostVisible, (ulong)Marshal.SizeOf(data)) { - Map (); - Update (data, createInfo.size); + /// + /// Create an empty mappable vulkan buffer whith specified size in byte. + /// + /// Logical Device. + /// Buffer Usage. + /// buffer memory size in byte + /// If set to true, buffer will stay mapped after the constructor. + /// If set to true vulkan memory with have the coherent flag. + public HostBuffer (Device device, VkBufferUsageFlags usage, UInt64 size, bool keepMapped = false, bool coherentMem = true) + : base (device, usage, coherentMem ? VkMemoryPropertyFlags.HostVisible | VkMemoryPropertyFlags.HostCoherent : VkMemoryPropertyFlags.HostVisible, size) { + if (keepMapped) + Map (); + } + /// + /// Create a mappable vulkan buffer whith the supplied object. + /// + /// Logical Device. + /// Buffer Usage. + /// Object to set as content of the buffer. It must be blittable to be able to compute size automatically. + /// If set to true, buffer will stay mapped after the constructor. + /// If set to true vulkan memory with have the coherent flag. + public HostBuffer (Device device, VkBufferUsageFlags usage, object data, bool keepMapped = false, bool coherentMem = true) + : base (device, usage, coherentMem ? VkMemoryPropertyFlags.HostVisible | VkMemoryPropertyFlags.HostCoherent : VkMemoryPropertyFlags.HostVisible, (ulong)Marshal.SizeOf (data)) { + Map (); + Update (data, createInfo.size); if (!keepMapped) - Unmap (); - } - public HostBuffer (Device device, VkBufferUsageFlags usage, UInt64 size, IntPtr data, bool keepMapped = false, bool coherentMem = true) - : base (device, usage, coherentMem ? VkMemoryPropertyFlags.HostVisible | VkMemoryPropertyFlags.HostCoherent : VkMemoryPropertyFlags.HostVisible, size) { - Map (); - unsafe { - System.Buffer.MemoryCopy (data.ToPointer (), mappedData.ToPointer (), size, size); - } + Unmap (); + } + /// + /// Create a mappable vulkan buffer of specified size whith a data pointer. + /// + /// Logical Device. + /// Buffer Usage. + /// Size in byte of the datas supplied with the pointer. + /// Managed pointer which point to the data to copy in the buffer at startup. + /// If set to true, buffer will stay mapped after the constructor. + /// If set to true vulkan memory with have the coherent flag. + public HostBuffer (Device device, VkBufferUsageFlags usage, UInt64 size, IntPtr data, bool keepMapped = false, bool coherentMem = true) + : base (device, usage, coherentMem ? VkMemoryPropertyFlags.HostVisible | VkMemoryPropertyFlags.HostCoherent : VkMemoryPropertyFlags.HostVisible, size) { + Map (); + unsafe { + System.Buffer.MemoryCopy (data.ToPointer (), mappedData.ToPointer (), size, size); + } if (!keepMapped) - Unmap (); - } - } + Unmap (); + } + } } diff --git a/vke/src/base/Image.cs b/vke/src/base/Image.cs index 9c1cb8e..b2ae336 100644 --- a/vke/src/base/Image.cs +++ b/vke/src/base/Image.cs @@ -14,59 +14,92 @@ namespace vke { /// such imported image will not be disposed with the sampler and the view. /// public class Image : Resource { + /// Default format to use if not defined by constructor parameters. public static VkFormat DefaultTextureFormat = VkFormat.R8g8b8a8Unorm; - internal VkImage handle; - VkImageCreateInfo info = VkImageCreateInfo.New(); + internal VkImage handle; + VkImageCreateInfo info = VkImageCreateInfo.New (); + uint[] queueFalillies; /// /// if true, the vkImage handle will not be destroyed on dispose, useful to create image for swapchain /// - bool imported; - - public VkDescriptorImageInfo Descriptor; - public VkImageCreateInfo CreateInfo => info; - public VkExtent3D Extent => info.extent; - public VkFormat Format => info.format; + bool imported; + + public VkDescriptorImageInfo Descriptor; + /// Get the create info structure used for creating this image. + public VkImageCreateInfo CreateInfo => info; + /// Get the dimensions in pixel for this image + public VkExtent3D Extent => info.extent; + /// Get image format + public VkFormat Format => info.format; + /// Native vulkan handle for the image. public VkImage Handle => handle; + /// Width in pixel of the image. public uint Width => CreateInfo.extent.width; + /// Height in pixel of the image. public uint Height => CreateInfo.extent.height; + /// Boolean indicating if memory allocated for this image has linear or optimal tiling. public override bool IsLinar => CreateInfo.tiling == VkImageTiling.Linear; - + /// + /// May be used to query the last known layout. It is set when commands explicitly secify the final layout of the image. + /// + /// Due to the automatic layout trasitions handled by several vulkan commands, use this property with caution, it's value + /// may not be the actual layout of the image. public VkImageLayout lastKnownLayout { get; private set; } protected override VkDebugUtilsObjectNameInfoEXT DebugUtilsInfo => new VkDebugUtilsObjectNameInfoEXT (VkObjectType.Image, handle.Handle); #region CTORS + /// + /// Create a new Image. + /// + /// Initial layout will be automatically set to Undefined if tiling is optimal and Preinitialized if tiling is linear. + /// The logical device that create the image. + /// format and type of the texel blocks that will be contained in the image + /// bitmask describing the intended usage of the image. + /// Memory property flags. + /// number of data in the X dimension of the image. + /// number of data in the Y dimension of the image. + /// value specifying the basic dimensionality of the image. Layers in array textures do not count as a dimension for the purposes of the image type. + /// number of sample per texel. + /// tiling arrangement of the texel blocks in memory. + /// describes the number of levels of detail available for minified sampling of the image. + /// number of layers in the image. + /// number of data in the Z dimension of the image + /// bitmask describing additional parameters of the image. + /// value specifying the sharing mode of the image when it will be accessed by multiple queue families. + /// list of queue families that will access this image (ignored if sharingMode is not CONCURRENT). public Image (Device device, VkFormat format, VkImageUsageFlags usage, VkMemoryPropertyFlags _memoryPropertyFlags, - uint width, uint height, - VkImageType type = VkImageType.Image2D, VkSampleCountFlags samples = VkSampleCountFlags.SampleCount1, - VkImageTiling tiling = VkImageTiling.Optimal, uint mipsLevels = 1, uint layers = 1, uint depth = 1, - VkImageCreateFlags createFlags = 0) - : base (device, _memoryPropertyFlags) { - - info.imageType = type; - info.format = format; - info.extent.width = width; - info.extent.height = height; - info.extent.depth = depth; - info.mipLevels = mipsLevels; - info.arrayLayers = layers; - info.samples = samples; - info.tiling = tiling; - info.usage = usage; - info.initialLayout = (tiling == VkImageTiling.Optimal) ? VkImageLayout.Undefined : VkImageLayout.Preinitialized; - info.sharingMode = VkSharingMode.Exclusive; + uint width, uint height, + VkImageType type = VkImageType.Image2D, VkSampleCountFlags samples = VkSampleCountFlags.SampleCount1, + VkImageTiling tiling = VkImageTiling.Optimal, uint mipsLevels = 1, uint layers = 1, uint depth = 1, + VkImageCreateFlags createFlags = 0, VkSharingMode sharingMode = VkSharingMode.Exclusive, params uint[] queuesFamillies) + : base (device, _memoryPropertyFlags) { + + info.imageType = type; + info.format = format; + info.extent.width = width; + info.extent.height = height; + info.extent.depth = depth; + info.mipLevels = mipsLevels; + info.arrayLayers = layers; + info.samples = samples; + info.tiling = tiling; + info.usage = usage; + info.initialLayout = (tiling == VkImageTiling.Optimal) ? VkImageLayout.Undefined : VkImageLayout.Preinitialized; + info.sharingMode = sharingMode; info.flags = createFlags; + this.queueFalillies = queuesFamillies; lastKnownLayout = info.initialLayout; - Activate ();//DONT OVERRIDE Activate in derived classes!!!! - } + Activate (); + } /// - /// Import vkImage handle into a new Image class, handle will be preserve on destruction. + /// Import vkImage handle into a new Image class, native handle will be preserve on destruction. /// public Image (Device device, VkImage vkHandle, VkFormat format, VkImageUsageFlags usage, uint width, uint height) : base (device, VkMemoryPropertyFlags.DeviceLocal) { @@ -85,13 +118,19 @@ namespace vke { imported = true; state = ActivableState.Activated; - references++;//increment ref because it is bound to swapchain + references++; } #endregion - public static uint ComputeMipLevels(uint size) => (uint)Math.Floor (Math.Log (size)) + 1; - public static uint ComputeMipLevels (int width, int height) => (uint)Math.Floor (Math.Log (Math.Max (width, height))) + 1; + public static uint ComputeMipLevels (uint size) => (uint)Math.Floor (Math.Log (size)) + 1; + public static uint ComputeMipLevels (int width, int height) => (uint)Math.Floor (Math.Log (Math.Max (width, height))) + 1; + /// + /// Check if specified image usage is supported for the given physical image format. + /// + /// true, if usage is supported + /// bitmask of intend usage for an image. + /// Physical format feature bitmask as returned by `GetFormatProperties` of PhysicalDevice public static bool CheckFormatIsSupported (VkImageUsageFlags usage, VkFormatFeatureFlags phyFormatSupport) { if (usage.HasFlag (VkImageUsageFlags.TransferSrc) & !phyFormatSupport.HasFlag (VkFormatFeatureFlags.TransferSrc)) return false; @@ -214,7 +253,7 @@ namespace vke { return img; } - } + } /// /// create host visible linear image without command from byte array /// @@ -293,9 +332,9 @@ namespace vke { #endregion - internal override void updateMemoryRequirements () { - vkGetImageMemoryRequirements (Dev.VkDev, handle, out memReqs); - } + internal override void updateMemoryRequirements () { + vkGetImageMemoryRequirements (Dev.VkDev, handle, out memReqs); + } internal override void bindMemory () { #if MEMORY_POOLS Utils.CheckResult (vkBindImageMemory (Dev.VkDev, handle, memoryPool.vkMemory, poolOffset)); @@ -303,9 +342,15 @@ namespace vke { Utils.CheckResult (vkBindImageMemory (Dev.VkDev, handle, vkMemory, 0)); #endif } - public override void Activate () { + public sealed override void Activate () { if (state != ActivableState.Activated) { - Utils.CheckResult (vkCreateImage (Dev.VkDev, ref info, IntPtr.Zero, out handle)); + if (info.sharingMode == VkSharingMode.Concurrent && queueFalillies?.Length > 0) { + info.queueFamilyIndexCount = (uint)queueFalillies.Length; + info.pQueueFamilyIndices = queueFalillies.Pin (); + Utils.CheckResult (vkCreateImage (Dev.VkDev, ref info, IntPtr.Zero, out handle)); + queueFalillies.Unpin (); + } else + Utils.CheckResult (vkCreateImage (Dev.VkDev, ref info, IntPtr.Zero, out handle)); #if MEMORY_POOLS Dev.resourceManager.Add (this); #else @@ -315,70 +360,78 @@ namespace vke { #endif } - base.Activate (); - } + base.Activate (); + } public void CreateView (VkImageViewType type = VkImageViewType.ImageView2D, VkImageAspectFlags aspectFlags = VkImageAspectFlags.Color, - uint layerCount = 1, - uint baseMipLevel = 0, int levelCount = -1, uint baseArrayLayer = 0, + uint layerCount = 1, uint baseMipLevel = 0, int levelCount = -1, uint baseArrayLayer = 0, VkComponentSwizzle r = VkComponentSwizzle.R, VkComponentSwizzle g = VkComponentSwizzle.G, VkComponentSwizzle b = VkComponentSwizzle.B, VkComponentSwizzle a = VkComponentSwizzle.A) { - VkImageView view = default(VkImageView); - VkImageViewCreateInfo viewInfo = VkImageViewCreateInfo.New(); - viewInfo.image = handle; - viewInfo.viewType = type; - viewInfo.format = Format; - viewInfo.components.r = r; - viewInfo.components.g = g; - viewInfo.components.b = b; - viewInfo.components.a = a; - viewInfo.subresourceRange.aspectMask = aspectFlags; + VkImageView view = default (VkImageView); + VkImageViewCreateInfo viewInfo = VkImageViewCreateInfo.New (); + viewInfo.image = handle; + viewInfo.viewType = type; + viewInfo.format = Format; + viewInfo.components.r = r; + viewInfo.components.g = g; + viewInfo.components.b = b; + viewInfo.components.a = a; + viewInfo.subresourceRange.aspectMask = aspectFlags; viewInfo.subresourceRange.baseMipLevel = baseMipLevel; viewInfo.subresourceRange.levelCount = levelCount < 0 ? info.mipLevels : (uint)levelCount; viewInfo.subresourceRange.baseArrayLayer = baseArrayLayer; viewInfo.subresourceRange.layerCount = layerCount; - Utils.CheckResult (vkCreateImageView (Dev.VkDev, ref viewInfo, IntPtr.Zero, out view)); + Utils.CheckResult (vkCreateImageView (Dev.VkDev, ref viewInfo, IntPtr.Zero, out view)); - if (Descriptor.imageView.Handle != 0) - Dev.DestroyImageView (Descriptor.imageView); - Descriptor.imageView = view; - } + if (Descriptor.imageView.Handle != 0) + Dev.DestroyImageView (Descriptor.imageView); + Descriptor.imageView = view; + } public void CreateSampler (VkSamplerAddressMode addressMode, VkFilter minFilter = VkFilter.Linear, VkFilter magFilter = VkFilter.Linear, VkSamplerMipmapMode mipmapMode = VkSamplerMipmapMode.Linear, float maxAnisotropy = 1.0f, float minLod = 0.0f, float maxLod = -1f) { CreateSampler (minFilter, magFilter, mipmapMode, addressMode, maxAnisotropy, minLod, maxLod); } - + /// + /// Create a Sampler and store it into the Descriptor structure of this image. + /// + /// Minimum filter. + /// Mag filter. + /// Mipmap mode. + /// Address mode. + /// Max anisotropy. + /// Minimum lod. + /// Max lod. public void CreateSampler (VkFilter minFilter = VkFilter.Linear, VkFilter magFilter = VkFilter.Linear, - VkSamplerMipmapMode mipmapMode = VkSamplerMipmapMode.Linear, VkSamplerAddressMode addressMode = VkSamplerAddressMode.Repeat, - float maxAnisotropy = 1.0f, float minLod = 0.0f, float maxLod = -1f) { - VkSampler sampler; - VkSamplerCreateInfo sampInfo = VkSamplerCreateInfo.New(); - sampInfo.maxAnisotropy = maxAnisotropy; + VkSamplerMipmapMode mipmapMode = VkSamplerMipmapMode.Linear, VkSamplerAddressMode addressMode = VkSamplerAddressMode.Repeat, + float maxAnisotropy = 1.0f, float minLod = 0.0f, float maxLod = -1f) { + VkSampler sampler; + VkSamplerCreateInfo sampInfo = VkSamplerCreateInfo.New (); + sampInfo.maxAnisotropy = maxAnisotropy; sampInfo.maxAnisotropy = 1.0f;// device->enabledFeatures.samplerAnisotropy ? device->properties.limits.maxSamplerAnisotropy : 1.0f; - //samplerInfo.anisotropyEnable = device->enabledFeatures.samplerAnisotropy; + //samplerInfo.anisotropyEnable = device->enabledFeatures.samplerAnisotropy; sampInfo.addressModeU = addressMode; - sampInfo.addressModeV = addressMode; - sampInfo.addressModeW = addressMode; - sampInfo.magFilter = magFilter; - sampInfo.minFilter = minFilter; - sampInfo.mipmapMode = mipmapMode; - sampInfo.minLod = minLod; - sampInfo.maxLod = maxLod < 0f ? info.mipLevels > 1 ? info.mipLevels : 0 : maxLod; + sampInfo.addressModeV = addressMode; + sampInfo.addressModeW = addressMode; + sampInfo.magFilter = magFilter; + sampInfo.minFilter = minFilter; + sampInfo.mipmapMode = mipmapMode; + sampInfo.minLod = minLod; + sampInfo.maxLod = maxLod < 0f ? info.mipLevels > 1 ? info.mipLevels : 0 : maxLod; sampInfo.compareOp = VkCompareOp.Never; sampInfo.borderColor = VkBorderColor.FloatOpaqueWhite; - Utils.CheckResult (vkCreateSampler (Dev.VkDev, ref sampInfo, IntPtr.Zero, out sampler)); + Utils.CheckResult (vkCreateSampler (Dev.VkDev, ref sampInfo, IntPtr.Zero, out sampler)); - if (Descriptor.sampler.Handle != 0) - Dev.DestroySampler (Descriptor.sampler); - Descriptor.sampler = sampler; - } + if (Descriptor.sampler.Handle != 0) + Dev.DestroySampler (Descriptor.sampler); + Descriptor.sampler = sampler; + } public void SetLayout (CommandBuffer cmdbuffer, VkImageAspectFlags aspectMask, @@ -387,25 +440,25 @@ namespace vke { } public void SetLayout (CommandBuffer cmdbuffer, VkImageAspectFlags aspectMask, - VkImageLayout oldImageLayout, + VkImageLayout oldImageLayout, VkImageLayout newImageLayout) { SetLayout (cmdbuffer, aspectMask, oldImageLayout, newImageLayout, oldImageLayout.GetDefaultStage (), newImageLayout.GetDefaultStage ()); } public void SetLayout ( - CommandBuffer cmdbuffer, - VkImageAspectFlags aspectMask, - VkImageLayout oldImageLayout, - VkImageLayout newImageLayout, - VkPipelineStageFlags srcStageMask, - VkPipelineStageFlags dstStageMask) { - VkImageSubresourceRange subresourceRange = new VkImageSubresourceRange { - aspectMask = aspectMask, - baseMipLevel = 0, - levelCount = CreateInfo.mipLevels, - layerCount = CreateInfo.arrayLayers, - }; - SetLayout (cmdbuffer, oldImageLayout, newImageLayout, subresourceRange, srcStageMask, dstStageMask); - } + CommandBuffer cmdbuffer, + VkImageAspectFlags aspectMask, + VkImageLayout oldImageLayout, + VkImageLayout newImageLayout, + VkPipelineStageFlags srcStageMask, + VkPipelineStageFlags dstStageMask) { + VkImageSubresourceRange subresourceRange = new VkImageSubresourceRange { + aspectMask = aspectMask, + baseMipLevel = 0, + levelCount = CreateInfo.mipLevels, + layerCount = CreateInfo.arrayLayers, + }; + SetLayout (cmdbuffer, oldImageLayout, newImageLayout, subresourceRange, srcStageMask, dstStageMask); + } public void SetLayout ( CommandBuffer cmdbuffer, VkImageAspectFlags aspectMask, @@ -416,8 +469,7 @@ namespace vke { VkPipelineStageFlags srcStageMask = VkPipelineStageFlags.AllCommands, VkPipelineStageFlags dstStageMask = VkPipelineStageFlags.AllCommands, uint srcQueueFamilyIndex = Vk.QueueFamilyIgnored, - uint dstQueueFamilyIndex = Vk.QueueFamilyIgnored) - { + uint dstQueueFamilyIndex = Vk.QueueFamilyIgnored) { VkImageSubresourceRange subresourceRange = new VkImageSubresourceRange { aspectMask = aspectMask, baseMipLevel = 0, @@ -437,8 +489,7 @@ namespace vke { VkPipelineStageFlags srcStageMask = VkPipelineStageFlags.AllCommands, VkPipelineStageFlags dstStageMask = VkPipelineStageFlags.AllCommands, uint srcQueueFamilyIndex = Vk.QueueFamilyIgnored, - uint dstQueueFamilyIndex = Vk.QueueFamilyIgnored) - { + uint dstQueueFamilyIndex = Vk.QueueFamilyIgnored) { VkImageMemoryBarrier imageMemoryBarrier = VkImageMemoryBarrier.New (); imageMemoryBarrier.srcQueueFamilyIndex = srcQueueFamilyIndex; @@ -464,123 +515,123 @@ namespace vke { // an image and put it into an active command buffer // See chapter 11.4 "Image Layout" for details public void SetLayout ( - CommandBuffer cmdbuffer, - VkImageLayout oldImageLayout, - VkImageLayout newImageLayout, - VkImageSubresourceRange subresourceRange, - VkPipelineStageFlags srcStageMask = VkPipelineStageFlags.AllCommands, - VkPipelineStageFlags dstStageMask = VkPipelineStageFlags.AllCommands, + CommandBuffer cmdbuffer, + VkImageLayout oldImageLayout, + VkImageLayout newImageLayout, + VkImageSubresourceRange subresourceRange, + VkPipelineStageFlags srcStageMask = VkPipelineStageFlags.AllCommands, + VkPipelineStageFlags dstStageMask = VkPipelineStageFlags.AllCommands, uint srcQueueFamilyIndex = Vk.QueueFamilyIgnored, uint dstQueueFamilyIndex = Vk.QueueFamilyIgnored) { - // Create an image barrier object - VkImageMemoryBarrier imageMemoryBarrier = VkImageMemoryBarrier.New(); - imageMemoryBarrier.srcQueueFamilyIndex = srcQueueFamilyIndex; - imageMemoryBarrier.dstQueueFamilyIndex = dstQueueFamilyIndex; - imageMemoryBarrier.oldLayout = oldImageLayout; - imageMemoryBarrier.newLayout = newImageLayout; - imageMemoryBarrier.image = handle; - imageMemoryBarrier.subresourceRange = subresourceRange; - - // Source layouts (old) - // Source access mask controls actions that have to be finished on the old layout - // before it will be transitioned to the new layout - switch (oldImageLayout) { - case VkImageLayout.Undefined: - // Image layout is undefined (or does not matter) - // Only valid as initial layout - // No flags required, listed only for completeness - imageMemoryBarrier.srcAccessMask = 0; - break; - - case VkImageLayout.Preinitialized: - // Image is preinitialized - // Only valid as initial layout for linear images, preserves memory contents - // Make sure host writes have been finished - imageMemoryBarrier.srcAccessMask = VkAccessFlags.HostWrite; - break; - - case VkImageLayout.ColorAttachmentOptimal: - // Image is a color attachment - // Make sure any writes to the color buffer have been finished - imageMemoryBarrier.srcAccessMask = VkAccessFlags.ColorAttachmentWrite; - break; - - case VkImageLayout.DepthStencilAttachmentOptimal: - // Image is a depth/stencil attachment - // Make sure any writes to the depth/stencil buffer have been finished - imageMemoryBarrier.srcAccessMask = VkAccessFlags.DepthStencilAttachmentWrite; - break; - - case VkImageLayout.TransferSrcOptimal: - // Image is a transfer source - // Make sure any reads from the image have been finished - imageMemoryBarrier.srcAccessMask = VkAccessFlags.TransferRead; - break; - - case VkImageLayout.TransferDstOptimal: - // Image is a transfer destination - // Make sure any writes to the image have been finished - imageMemoryBarrier.srcAccessMask = VkAccessFlags.TransferWrite; - break; - - case VkImageLayout.ShaderReadOnlyOptimal: - // Image is read by a shader - // Make sure any shader reads from the image have been finished - imageMemoryBarrier.srcAccessMask = VkAccessFlags.ShaderRead; - break; - } - - // Target layouts (new) - // Destination access mask controls the dependency for the new image layout - switch (newImageLayout) { - case VkImageLayout.TransferDstOptimal: - // Image will be used as a transfer destination - // Make sure any writes to the image have been finished - imageMemoryBarrier.dstAccessMask = VkAccessFlags.TransferWrite; - break; - - case VkImageLayout.TransferSrcOptimal: - // Image will be used as a transfer source - // Make sure any reads from and writes to the image have been finished - //imageMemoryBarrier.srcAccessMask |= VkAccessFlags.TransferRead; - imageMemoryBarrier.dstAccessMask = VkAccessFlags.TransferRead; - break; - - case VkImageLayout.ColorAttachmentOptimal: - // Image will be used as a color attachment - // Make sure any writes to the color buffer have been finished - imageMemoryBarrier.srcAccessMask = VkAccessFlags.TransferRead; - imageMemoryBarrier.dstAccessMask = VkAccessFlags.ColorAttachmentWrite; - break; - - case VkImageLayout.DepthStencilAttachmentOptimal: - // Image layout will be used as a depth/stencil attachment - // Make sure any writes to depth/stencil buffer have been finished - imageMemoryBarrier.dstAccessMask = imageMemoryBarrier.dstAccessMask | VkAccessFlags.DepthStencilAttachmentWrite; - break; - - case VkImageLayout.ShaderReadOnlyOptimal: - // Image will be read in a shader (sampler, input attachment) - // Make sure any writes to the image have been finished - if (imageMemoryBarrier.srcAccessMask == 0) { - imageMemoryBarrier.srcAccessMask = VkAccessFlags.HostWrite | VkAccessFlags.TransferWrite; - } - imageMemoryBarrier.dstAccessMask = VkAccessFlags.ShaderRead; - break; - } - - // Put barrier inside setup command buffer - Vk.vkCmdPipelineBarrier ( - cmdbuffer.Handle, - srcStageMask, - dstStageMask, - 0, - 0,IntPtr.Zero, - 0, IntPtr.Zero, - 1, ref imageMemoryBarrier); + // Create an image barrier object + VkImageMemoryBarrier imageMemoryBarrier = VkImageMemoryBarrier.New (); + imageMemoryBarrier.srcQueueFamilyIndex = srcQueueFamilyIndex; + imageMemoryBarrier.dstQueueFamilyIndex = dstQueueFamilyIndex; + imageMemoryBarrier.oldLayout = oldImageLayout; + imageMemoryBarrier.newLayout = newImageLayout; + imageMemoryBarrier.image = handle; + imageMemoryBarrier.subresourceRange = subresourceRange; + + // Source layouts (old) + // Source access mask controls actions that have to be finished on the old layout + // before it will be transitioned to the new layout + switch (oldImageLayout) { + case VkImageLayout.Undefined: + // Image layout is undefined (or does not matter) + // Only valid as initial layout + // No flags required, listed only for completeness + imageMemoryBarrier.srcAccessMask = 0; + break; + + case VkImageLayout.Preinitialized: + // Image is preinitialized + // Only valid as initial layout for linear images, preserves memory contents + // Make sure host writes have been finished + imageMemoryBarrier.srcAccessMask = VkAccessFlags.HostWrite; + break; + + case VkImageLayout.ColorAttachmentOptimal: + // Image is a color attachment + // Make sure any writes to the color buffer have been finished + imageMemoryBarrier.srcAccessMask = VkAccessFlags.ColorAttachmentWrite; + break; + + case VkImageLayout.DepthStencilAttachmentOptimal: + // Image is a depth/stencil attachment + // Make sure any writes to the depth/stencil buffer have been finished + imageMemoryBarrier.srcAccessMask = VkAccessFlags.DepthStencilAttachmentWrite; + break; + + case VkImageLayout.TransferSrcOptimal: + // Image is a transfer source + // Make sure any reads from the image have been finished + imageMemoryBarrier.srcAccessMask = VkAccessFlags.TransferRead; + break; + + case VkImageLayout.TransferDstOptimal: + // Image is a transfer destination + // Make sure any writes to the image have been finished + imageMemoryBarrier.srcAccessMask = VkAccessFlags.TransferWrite; + break; + + case VkImageLayout.ShaderReadOnlyOptimal: + // Image is read by a shader + // Make sure any shader reads from the image have been finished + imageMemoryBarrier.srcAccessMask = VkAccessFlags.ShaderRead; + break; + } + + // Target layouts (new) + // Destination access mask controls the dependency for the new image layout + switch (newImageLayout) { + case VkImageLayout.TransferDstOptimal: + // Image will be used as a transfer destination + // Make sure any writes to the image have been finished + imageMemoryBarrier.dstAccessMask = VkAccessFlags.TransferWrite; + break; + + case VkImageLayout.TransferSrcOptimal: + // Image will be used as a transfer source + // Make sure any reads from and writes to the image have been finished + //imageMemoryBarrier.srcAccessMask |= VkAccessFlags.TransferRead; + imageMemoryBarrier.dstAccessMask = VkAccessFlags.TransferRead; + break; + + case VkImageLayout.ColorAttachmentOptimal: + // Image will be used as a color attachment + // Make sure any writes to the color buffer have been finished + imageMemoryBarrier.srcAccessMask = VkAccessFlags.TransferRead; + imageMemoryBarrier.dstAccessMask = VkAccessFlags.ColorAttachmentWrite; + break; + + case VkImageLayout.DepthStencilAttachmentOptimal: + // Image layout will be used as a depth/stencil attachment + // Make sure any writes to depth/stencil buffer have been finished + imageMemoryBarrier.dstAccessMask = imageMemoryBarrier.dstAccessMask | VkAccessFlags.DepthStencilAttachmentWrite; + break; + + case VkImageLayout.ShaderReadOnlyOptimal: + // Image will be read in a shader (sampler, input attachment) + // Make sure any writes to the image have been finished + if (imageMemoryBarrier.srcAccessMask == 0) { + imageMemoryBarrier.srcAccessMask = VkAccessFlags.HostWrite | VkAccessFlags.TransferWrite; + } + imageMemoryBarrier.dstAccessMask = VkAccessFlags.ShaderRead; + break; + } + + // Put barrier inside setup command buffer + Vk.vkCmdPipelineBarrier ( + cmdbuffer.Handle, + srcStageMask, + dstStageMask, + 0, + 0, IntPtr.Zero, + 0, IntPtr.Zero, + 1, ref imageMemoryBarrier); lastKnownLayout = newImageLayout; - } + } public void BuildMipmaps (Queue copyQ, CommandPool copyCmdPool) { if (info.mipLevels == 1) { @@ -598,6 +649,10 @@ namespace vke { cmd.Free (); } + /// + /// Build mipmap chain for this image. Final layout will be ShaderReadOnlyOptimal. + /// + /// a command buffer to handle the operation. public void BuildMipmaps (CommandBuffer cmd) { VkImageSubresourceRange mipSubRange = new VkImageSubresourceRange (VkImageAspectFlags.Color, 0, 1, 0, info.arrayLayers); @@ -605,7 +660,7 @@ namespace vke { for (int i = 1; i < info.mipLevels; i++) { VkImageBlit imageBlit = new VkImageBlit { - srcSubresource = new VkImageSubresourceLayers(VkImageAspectFlags.Color, info.arrayLayers, (uint)i - 1), + srcSubresource = new VkImageSubresourceLayers (VkImageAspectFlags.Color, info.arrayLayers, (uint)i - 1), srcOffsets_1 = new VkOffset3D ((int)info.extent.width >> (i - 1), (int)info.extent.height >> (i - 1), 1), dstSubresource = new VkImageSubresourceLayers (VkImageAspectFlags.Color, info.arrayLayers, (uint)i), dstOffsets_1 = new VkOffset3D ((int)info.extent.width >> i, (int)info.extent.height >> i, 1) @@ -621,14 +676,20 @@ namespace vke { SetLayout (cmd, VkImageAspectFlags.Color, VkImageLayout.TransferSrcOptimal, VkImageLayout.ShaderReadOnlyOptimal, VkPipelineStageFlags.Transfer, VkPipelineStageFlags.FragmentShader); } - public void BlitTo (CommandBuffer cmd, Image dest) { + /// + /// Blit this image into another. + /// + /// a command buffer to handle the blit operation. + /// the destination image to blit to. + /// filtering for the blit operation. + public void BlitTo (CommandBuffer cmd, Image dest, VkFilter filter = VkFilter.Linear) { VkImageBlit imageBlit = new VkImageBlit { srcSubresource = new VkImageSubresourceLayers (VkImageAspectFlags.Color, info.arrayLayers, 0), srcOffsets_1 = new VkOffset3D ((int)info.extent.width, (int)info.extent.height, 1), dstSubresource = new VkImageSubresourceLayers (VkImageAspectFlags.Color, info.arrayLayers, 0), dstOffsets_1 = new VkOffset3D ((int)dest.info.extent.width, (int)dest.info.extent.height, 1) }; - vkCmdBlitImage (cmd.Handle, handle, VkImageLayout.TransferSrcOptimal, dest.handle, VkImageLayout.TransferDstOptimal, 1, ref imageBlit, VkFilter.Linear); + vkCmdBlitImage (cmd.Handle, handle, VkImageLayout.TransferSrcOptimal, dest.handle, VkImageLayout.TransferDstOptimal, 1, ref imageBlit, filter); } public VkSubresourceLayout GetSubresourceLayout (VkImageAspectFlags aspectMask = VkImageAspectFlags.Color, uint mipLevel = 0, uint arrayLayer = 0) { VkImageSubresource subresource = new VkImageSubresource { @@ -641,22 +702,22 @@ namespace vke { } public override string ToString () { - return string.Format ($"{base.ToString ()}[0x{handle.Handle.ToString("x")}]"); + return string.Format ($"{base.ToString ()}[0x{handle.Handle.ToString ("x")}]"); } #region IDisposable Support - protected override void Dispose (bool disposing) { + protected override void Dispose (bool disposing) { if (state == ActivableState.Activated) { if (Descriptor.sampler.Handle != 0) - Dev.DestroySampler (Descriptor.sampler); - if (Descriptor.imageView.Handle != 0) - Dev.DestroyImageView (Descriptor.imageView); + Dev.DestroySampler (Descriptor.sampler); + if (Descriptor.imageView.Handle != 0) + Dev.DestroyImageView (Descriptor.imageView); if (!imported) { base.Dispose (disposing); Dev.DestroyImage (handle); } } state = ActivableState.Disposed; - } + } #endregion } } diff --git a/vke/src/base/Queue.cs b/vke/src/base/Queue.cs index b37bd94..0f9cd69 100644 --- a/vke/src/base/Queue.cs +++ b/vke/src/base/Queue.cs @@ -86,7 +86,7 @@ namespace vke { if (freeCommandBuffer) cmd.Free (); } - public void Submit (CommandBuffer cmd, VkSemaphore wait = default(VkSemaphore), VkSemaphore signal = default (VkSemaphore), VkFence fence = default (VkFence)) { + public void Submit (CommandBuffer cmd, VkSemaphore wait = default, VkSemaphore signal = default, Fence fence = null) { cmd.Submit (handle, wait, signal, fence); } public void WaitIdle () { diff --git a/vke/src/base/RenderPass.cs b/vke/src/base/RenderPass.cs index 57ceddb..ddbaa64 100644 --- a/vke/src/base/RenderPass.cs +++ b/vke/src/base/RenderPass.cs @@ -221,12 +221,10 @@ namespace vke { vkCmdEndRenderPass (cmd.Handle); } /// - /// Create a one framebuffer per swapchain images of the supplied swapChain. - /// The presentable attachment of this renderpass is found searching for its final layout that could be - /// PresentSrcKHR or SharedPresentKHR. + /// Create one framebuffer per swapchain images. The presentable attachment of this renderpass is found searching for its final layout that could be PresentSrcKHR or SharedPresentKHR. /// /// A collection of FrameBuffer - /// Swap chain. + /// a managed SwapChain instance. public FrameBuffers CreateFrameBuffers (SwapChain swapChain) { FrameBuffers fbs = new FrameBuffers(); Image[] images = new Image[attachments.Count]; diff --git a/vke/src/base/Resource.cs b/vke/src/base/Resource.cs index e489e35..8da99ec 100644 --- a/vke/src/base/Resource.cs +++ b/vke/src/base/Resource.cs @@ -10,6 +10,9 @@ using Vulkan; using static Vulkan.Vk; namespace vke { + /// + /// Abstract base class for Images and Buffers resources. + /// [DebuggerDisplay ("{previous.name} <- {name} -> {next.name}")] public abstract class Resource : Activable { protected VkMemoryRequirements memReqs; @@ -20,13 +23,16 @@ namespace vke { protected VkDeviceMemory vkMemory; #endif - /// double linked list in memory pool + /// Double linked list in memory pool internal Resource previous; public Resource next; + /// Effective memory allocation for the resource. public ulong AllocatedDeviceMemorySize => memReqs.size; public uint TypeBits => memReqs.memoryTypeBits; + /// Alignment constraint of the memory to allocate for the resource. public ulong MemoryAlignment => memReqs.alignment; + /// Boolean indicating if used memory for the resource is linear. public abstract bool IsLinar { get; } protected IntPtr mappedData; @@ -34,25 +40,25 @@ namespace vke { public readonly VkMemoryPropertyFlags MemoryFlags; - protected Resource (Device device, VkMemoryPropertyFlags memoryFlags) : base (device) { - MemoryFlags = memoryFlags; - } + protected Resource (Device device, VkMemoryPropertyFlags memoryFlags) : base (device) { + MemoryFlags = memoryFlags; + } - internal abstract void updateMemoryRequirements (); + internal abstract void updateMemoryRequirements (); internal abstract void bindMemory (); internal VkMappedMemoryRange MapRange => new VkMappedMemoryRange { - sType = VkStructureType.MappedMemoryRange, + sType = VkStructureType.MappedMemoryRange, #if MEMORY_POOLS - memory = memoryPool.vkMemory, - offset = poolOffset, + memory = memoryPool.vkMemory, + offset = poolOffset, #else memory = vkMemory, offset = 0, #endif - size = AllocatedDeviceMemorySize - }; + size = AllocatedDeviceMemorySize + }; #if !MEMORY_POOLS protected void allocateMemory () { VkMemoryAllocateInfo memInfo = VkMemoryAllocateInfo.New (); @@ -67,7 +73,7 @@ namespace vke { #if MEMORY_POOLS if (!memoryPool.IsMapped) memoryPool.Map (); - mappedData = new IntPtr(memoryPool.MappedData.ToInt64() + (long)(poolOffset + offset)); + mappedData = new IntPtr (memoryPool.MappedData.ToInt64 () + (long)(poolOffset + offset)); #else Utils.CheckResult (vkMapMemory (Dev.VkDev, vkMemory, offset, AllocatedDeviceMemorySize, 0, ref mappedData)); #endif @@ -80,19 +86,19 @@ namespace vke { #endif } public void Update (object data, ulong size, ulong offset = 0) { - GCHandle ptr = GCHandle.Alloc (data, GCHandleType.Pinned); - unsafe { - System.Buffer.MemoryCopy (ptr.AddrOfPinnedObject ().ToPointer (), (mappedData + (int)offset).ToPointer (), size, size); - } - ptr.Free (); - } - public void Flush () { + GCHandle ptr = GCHandle.Alloc (data, GCHandleType.Pinned); + unsafe { + System.Buffer.MemoryCopy (ptr.AddrOfPinnedObject ().ToPointer (), (mappedData + (int)offset).ToPointer (), size, size); + } + ptr.Free (); + } + public void Flush () { VkMappedMemoryRange range = MapRange; - vkFlushMappedMemoryRanges (Dev.VkDev, 1, ref range); - } + vkFlushMappedMemoryRanges (Dev.VkDev, 1, ref range); + } -#region IDisposable Support - protected override void Dispose (bool disposing) { + #region IDisposable Support + protected override void Dispose (bool disposing) { if (!disposing) System.Diagnostics.Debug.WriteLine ("VKE Activable object disposed by finalizer"); if (state == ActivableState.Activated) { @@ -106,7 +112,7 @@ namespace vke { } base.Dispose (disposing); - } -#endregion + } + #endregion } } \ No newline at end of file diff --git a/vke/src/base/SwapChain.cs b/vke/src/base/SwapChain.cs index eba607d..f9d5619 100644 --- a/vke/src/base/SwapChain.cs +++ b/vke/src/base/SwapChain.cs @@ -7,7 +7,7 @@ using Vulkan; using static Vulkan.Vk; namespace vke { - public class SwapChain : Activable { + public class SwapChain : Activable { /// /// Set the default swapchain image format. /// @@ -24,7 +24,7 @@ namespace vke { PresentQueue presentQueue; public VkSemaphore presentComplete; - public Image[] images; + public Image[] images; protected override VkDebugUtilsObjectNameInfoEXT DebugUtilsInfo => new VkDebugUtilsObjectNameInfoEXT (VkObjectType.SwapchainKHR, Handle.Handle); @@ -32,47 +32,47 @@ namespace vke { /// Swapchain images count. public uint ImageCount => (uint)images?.Length; public uint Width => createInfos.imageExtent.width; - public uint Height => createInfos.imageExtent.height; - public VkFormat ColorFormat => createInfos.imageFormat; - public VkImageUsageFlags ImageUsage => createInfos.imageUsage; - - public SwapChain (PresentQueue _presentableQueue, uint width = 800, uint height = 600, VkFormat format = VkFormat.B8g8r8a8Unorm, - VkPresentModeKHR presentMode = VkPresentModeKHR.FifoKHR) - : base (_presentableQueue.dev){ - - presentQueue = _presentableQueue; - createInfos = VkSwapchainCreateInfoKHR.New(); - - VkSurfaceFormatKHR[] formats = Dev.phy.GetSurfaceFormats (presentQueue.Surface); - for (int i = 0; i < formats.Length; i++) { - if (formats[i].format == format) { - createInfos.imageFormat = format; - createInfos.imageColorSpace = formats[i].colorSpace; - break; - } - } - if (createInfos.imageFormat == VkFormat.Undefined) - throw new Exception ("Invalid format for swapchain: " + format); - - VkPresentModeKHR[] presentModes = Dev.phy.GetSurfacePresentModes (presentQueue.Surface); - for (int i = 0; i < presentModes.Length; i++) { - if (presentModes[i] == presentMode) { - createInfos.presentMode = presentMode; - break; - } - } - if (createInfos.presentMode != presentMode) - throw new Exception ("Invalid presentMode for swapchain: " + presentMode); - - createInfos.surface = presentQueue.Surface; - createInfos.imageExtent = new VkExtent2D (width, height); - createInfos.imageArrayLayers = 1; - createInfos.imageUsage = IMAGES_USAGE; - createInfos.imageSharingMode = VkSharingMode.Exclusive; - createInfos.compositeAlpha = VkCompositeAlphaFlagsKHR.OpaqueKHR; - createInfos.presentMode = presentMode; - createInfos.clipped = 1; - } + public uint Height => createInfos.imageExtent.height; + public VkFormat ColorFormat => createInfos.imageFormat; + public VkImageUsageFlags ImageUsage => createInfos.imageUsage; + + public SwapChain (PresentQueue _presentableQueue, uint width = 800, uint height = 600, VkFormat format = VkFormat.B8g8r8a8Unorm, + VkPresentModeKHR presentMode = VkPresentModeKHR.FifoKHR) + : base (_presentableQueue.dev) { + + presentQueue = _presentableQueue; + createInfos = VkSwapchainCreateInfoKHR.New (); + + VkSurfaceFormatKHR[] formats = Dev.phy.GetSurfaceFormats (presentQueue.Surface); + for (int i = 0; i < formats.Length; i++) { + if (formats[i].format == format) { + createInfos.imageFormat = format; + createInfos.imageColorSpace = formats[i].colorSpace; + break; + } + } + if (createInfos.imageFormat == VkFormat.Undefined) + throw new Exception ("Invalid format for swapchain: " + format); + + VkPresentModeKHR[] presentModes = Dev.phy.GetSurfacePresentModes (presentQueue.Surface); + for (int i = 0; i < presentModes.Length; i++) { + if (presentModes[i] == presentMode) { + createInfos.presentMode = presentMode; + break; + } + } + if (createInfos.presentMode != presentMode) + throw new Exception ("Invalid presentMode for swapchain: " + presentMode); + + createInfos.surface = presentQueue.Surface; + createInfos.imageExtent = new VkExtent2D (width, height); + createInfos.imageArrayLayers = 1; + createInfos.imageUsage = IMAGES_USAGE; + createInfos.imageSharingMode = VkSharingMode.Exclusive; + createInfos.compositeAlpha = VkCompositeAlphaFlagsKHR.OpaqueKHR; + createInfos.presentMode = presentMode; + createInfos.clipped = 1; + } public override void Activate () { if (state != ActivableState.Activated) { presentComplete = Dev.CreateSemaphore (); @@ -87,63 +87,69 @@ namespace vke { Dev.WaitIdle (); - VkSurfaceCapabilitiesKHR capabilities = Dev.phy.GetSurfaceCapabilities (presentQueue.Surface); + VkSurfaceCapabilitiesKHR capabilities = Dev.phy.GetSurfaceCapabilities (presentQueue.Surface); - createInfos.minImageCount = capabilities.minImageCount; - createInfos.preTransform = capabilities.currentTransform; - createInfos.oldSwapchain = Handle; + createInfos.minImageCount = capabilities.minImageCount; + createInfos.preTransform = capabilities.currentTransform; + createInfos.oldSwapchain = Handle; - if (capabilities.currentExtent.width == 0xFFFFFFFF) { - if (createInfos.imageExtent.width < capabilities.minImageExtent.width) - createInfos.imageExtent.width = capabilities.minImageExtent.width; - else if (createInfos.imageExtent.width > capabilities.maxImageExtent.width) - createInfos.imageExtent.width = capabilities.maxImageExtent.width; + if (capabilities.currentExtent.width == 0xFFFFFFFF) { + if (createInfos.imageExtent.width < capabilities.minImageExtent.width) + createInfos.imageExtent.width = capabilities.minImageExtent.width; + else if (createInfos.imageExtent.width > capabilities.maxImageExtent.width) + createInfos.imageExtent.width = capabilities.maxImageExtent.width; - if (createInfos.imageExtent.height < capabilities.minImageExtent.height) - createInfos.imageExtent.height = capabilities.minImageExtent.height; - else if (createInfos.imageExtent.height > capabilities.maxImageExtent.height) - createInfos.imageExtent.height = capabilities.maxImageExtent.height; - } else - createInfos.imageExtent = capabilities.currentExtent; + if (createInfos.imageExtent.height < capabilities.minImageExtent.height) + createInfos.imageExtent.height = capabilities.minImageExtent.height; + else if (createInfos.imageExtent.height > capabilities.maxImageExtent.height) + createInfos.imageExtent.height = capabilities.maxImageExtent.height; + } else + createInfos.imageExtent = capabilities.currentExtent; - VkSwapchainKHR newSwapChain = Dev.CreateSwapChain (createInfos); - if (Handle.Handle != 0) - _destroy (); - Handle = newSwapChain; + Utils.CheckResult (vkCreateSwapchainKHR (Dev.VkDev, ref createInfos, IntPtr.Zero, out VkSwapchainKHR newSwapChain)); + + if (Handle.Handle != 0) + _destroy (); + Handle = newSwapChain; if (state != ActivableState.Activated) Activate (); - - VkImage[] tmp = Dev.GetSwapChainImages (Handle); - images = new Image[tmp.Length]; - for (int i = 0; i < tmp.Length; i++) { - images[i] = new Image (Dev, tmp[i], ColorFormat, ImageUsage, Width, Height); - images[i].CreateView (); + + Utils.CheckResult (vkGetSwapchainImagesKHR (Dev.VkDev, Handle, out uint imageCount, IntPtr.Zero)); + if (imageCount == 0) + throw new Exception ("Swapchain image count is 0."); + VkImage[] imgs = new VkImage[imageCount]; + Utils.CheckResult (vkGetSwapchainImagesKHR (Dev.VkDev, Handle, out imageCount, imgs.Pin ())); + imgs.Unpin (); + + images = new Image[imgs.Length]; + for (int i = 0; i < imgs.Length; i++) { + images[i] = new Image (Dev, imgs[i], ColorFormat, ImageUsage, Width, Height); + images[i].CreateView (); images[i].SetName ("SwapChain Img" + i); images[i].Descriptor.imageView.SetDebugMarkerName (Dev, "SwapChain Img" + i + " view"); - } - } + } + } /// /// Acquire next image, recreate swapchain if out of date or suboptimal error. /// /// Swapchain image index or -1 if failed /// Fence param of 'vkAcquireNextImageKHR' - public int GetNextImage (VkFence fence = default(VkFence)) { - VkResult res = vkAcquireNextImageKHR (Dev.VkDev, Handle, UInt64.MaxValue, presentComplete, fence, out currentImageIndex); - if (res == VkResult.ErrorOutOfDateKHR || res == VkResult.SuboptimalKHR) { - Create (); - return -1; - } - Utils.CheckResult (res); - return (int)currentImageIndex; - } + public int GetNextImage (VkFence fence = default (VkFence)) { + VkResult res = vkAcquireNextImageKHR (Dev.VkDev, Handle, UInt64.MaxValue, presentComplete, fence, out currentImageIndex); + if (res == VkResult.ErrorOutOfDateKHR || res == VkResult.SuboptimalKHR) { + Create (); + return -1; + } + Utils.CheckResult (res); + return (int)currentImageIndex; + } void _destroy () { - for (int i = 0; i < ImageCount; i++) - images[i].Dispose (); - - Dev.DestroySwapChain (Handle); - } + for (int i = 0; i < ImageCount; i++) + images[i].Dispose (); + vkDestroySwapchainKHR (Dev.VkDev, Handle, IntPtr.Zero); + } public override string ToString () { return string.Format ($"{base.ToString ()}[0x{Handle.Handle.ToString ("x")}]"); diff --git a/vke/src/glfw/CodePoint.cs b/vke/src/glfw/CodePoint.cs deleted file mode 100644 index a081e9f..0000000 --- a/vke/src/glfw/CodePoint.cs +++ /dev/null @@ -1,39 +0,0 @@ -// Copyright (c) 2019 Andrew Armstrong/FacticiusVir -// Copyright (c) 2019 Jean-Philippe Bruyère -// -// This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) -using System.Runtime.InteropServices; -using System.Text; - -namespace Glfw -{ - /// - /// Represents a native UTF32 codepoint. - /// - [StructLayout (LayoutKind.Explicit)] - public struct CodePoint - { - /// - /// The numeric value of the codepoint. - /// - [FieldOffset (0)] public readonly uint Value; - [FieldOffset (0)] readonly byte byte0; - [FieldOffset (1)] readonly byte byte1; - [FieldOffset (2)] readonly byte byte2; - [FieldOffset (3)] readonly byte byte3; - /// - /// Casts the codepoint to System.Char. - /// - /// - /// The character representation of the codepoint. - /// - public char ToChar() => Encoding.UTF32.GetChars (new byte[] { byte0, byte1, byte2, byte3 })[0]; - /// - /// Converts the value of this instance to its equivalent string representation. - /// - /// - /// A string containing the character representation of the codepoint. - /// - public override string ToString() => ToChar().ToString(); - } -} diff --git a/vke/src/glfw/Delegates.cs b/vke/src/glfw/Delegates.cs deleted file mode 100644 index bfcbb0e..0000000 --- a/vke/src/glfw/Delegates.cs +++ /dev/null @@ -1,127 +0,0 @@ -// Copyright (c) 2019 Andrew Armstrong/FacticiusVir -// Copyright (c) 2019 Jean-Philippe Bruyère -// -// This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT)using System; -using System; -using System.Runtime.InteropServices; - -namespace Glfw { - /// - /// The function signature for keyboard key callback functions. - /// - /// - /// The window that received the event. - /// - /// - /// The keyboard key that was pressed or released. - /// - /// - /// The system-specific scancode of the key. - /// - /// - /// The input action that occured. - /// - /// - /// Bit field describing which modifier keys were held down. - /// - public delegate void KeyDelegate (IntPtr window, Key key, int scanCode, InputAction action, Modifier modifiers); - /// - /// A delegate representing character events on a WindowHandle. - /// - /// - /// The window raising the event. - /// - /// - /// The Unicode codepoint of the character. - /// - public delegate void CharDelegate (IntPtr window, CodePoint codepoint); - /// - /// A delegate representing character events with modifiers on a WindowHandle. - /// - /// - /// The window raising the event. - /// - /// - /// The Unicode codepoint of the character. - /// - /// - /// The modifiers applied to the character. - /// - public delegate void CharModsDelegate (IntPtr window, CodePoint codepoint, Modifier modifiers); - /// - /// The function signature for cursor position callback functions. - /// - /// - /// The window that received the event. - /// - /// - /// The new cursor x-coordinate, relative to the left edge of the client area. - /// - /// - /// The new cursor y-coordinate, relative to the top edge of the client area. - /// - public delegate void CursorPosDelegate (IntPtr window, double xPosition, double yPosition); - /// - /// The function signature for error callbacks. - /// - /// An error code giving the general category of the error. - /// A string description of the error. - [UnmanagedFunctionPointer (CallingConvention.Cdecl)] - public delegate void ErrorDelegate (ErrorCode error, [MarshalAs (UnmanagedType.LPStr)] string description); - /// - /// The function signature for monitor configuration callback functions. - /// - /// - /// The monitor that was connected or disconnected. - /// - /// - /// The event that was raised. - /// - [UnmanagedFunctionPointer (CallingConvention.Cdecl)] - public delegate void MonitorEventDelegate (MonitorHandle monitor, MonitorEvent eventStatus); - /// - /// The function signature for mouse button callback functions. - /// - /// - /// The window that received the event. - /// - /// - /// The mouse button that was pressed or released. - /// - /// - /// One of or . - /// - /// - /// Bit field describing which modifier keys were held down. - /// - public delegate void MouseButtonDelegate (IntPtr window, MouseButton button, InputAction action, Modifier mods); - /// - /// The function signature for scroll callback functions. - /// - /// - /// The window that received the event. - /// - /// - /// The scroll offset along the x-axis. - /// - /// - /// The scroll offset along the y-axis. - /// - public delegate void ScrollDelegate (IntPtr window, double xOffset, double yOffset); - /// - /// The function signature for window size callback functions. - /// - /// - /// The window that was resized. - /// - /// - /// The new width, in screen coordinates, of the window. - /// - /// - /// The new height, in screen coordinates, of the window. - /// - [UnmanagedFunctionPointer (CallingConvention.Cdecl)] - public delegate void WindowSizeDelegate (IntPtr window, int width, int height); - -} - diff --git a/vke/src/glfw/ErrorCode.cs b/vke/src/glfw/ErrorCode.cs deleted file mode 100644 index ef76890..0000000 --- a/vke/src/glfw/ErrorCode.cs +++ /dev/null @@ -1,53 +0,0 @@ -// Copyright (c) 2019 Andrew Armstrong/FacticiusVir -// Copyright (c) 2019 Jean-Philippe Bruyère -// -// This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) -namespace Glfw -{ - /// - /// Indicates the general category of an error. - /// - public enum ErrorCode - { - /// - /// GLFW has not been initialized. - /// - NotInitialised = 0x00010001, - /// - /// No context is current for this thread. - /// - NoCurrentContext, - /// - /// One of the arguments to the function was an invalid enum value. - /// - InvalidEnum, - /// - /// One of the arguments to the function was an invalid value. - /// - InvalidValue, - /// - /// A memory allocation failed. - /// - OutOfMemory, - /// - /// GLFW could not find support for the requested API on the system. - /// - ApiUnavailable, - /// - /// The requested OpenGL or OpenGL ES version is not available. - /// - VersionUnavailable, - /// - /// A platform-specific error occurred that does not match any of the more specific categories. - /// - PlatformError, - /// - /// The requested format is not supported or available. - /// - FormatUnavailable, - /// - /// The specified window does not have an OpenGL or OpenGL ES context. - /// - NoWindowContext - } -} diff --git a/vke/src/glfw/Glfw3.cs b/vke/src/glfw/Glfw3.cs deleted file mode 100644 index 081ec5c..0000000 --- a/vke/src/glfw/Glfw3.cs +++ /dev/null @@ -1,533 +0,0 @@ -// Copyright (c) 2019 Andrew Armstrong/FacticiusVir -// Copyright (c) 2019 Jean-Philippe Bruyère -// -// This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) -using System; -using System.Runtime.InteropServices; - -namespace Glfw { - public enum CursorShape - { - Arrow = 0x00036001, - IBeam = 0x00036002, - Crosshair = 0x00036003, - Hand = 0x00036004, - HResize = 0x00036005, - VResize = 0x00036006 - } - /// - /// Interop functions for the GLFW3 API. - /// - public static class Glfw3 - { - /// - /// The base name for the GLFW3 library. - /// - public const string GlfwDll = "glfw"; - - /// - /// Initializes the GLFW library. - /// - /// - /// True if successful, otherwise false. - /// - [DllImport(GlfwDll, CallingConvention = CallingConvention.Cdecl, EntryPoint = "glfwInit")] - [return: MarshalAs(UnmanagedType.Bool)] - public static extern bool Init(); - - /// - /// This function destroys all remaining windows and cursors, restores - /// any modified gamma ramps and frees any other allocated resources. - /// - [DllImport(GlfwDll, CallingConvention = CallingConvention.Cdecl, EntryPoint = "glfwTerminate")] - public static extern void Terminate(); - - /// - /// This function retrieves the major, minor and revision numbers of - /// the GLFW library. - /// - /// - /// The major version number. - /// - /// - /// The minor version number. - /// - /// - /// The revision number. - /// - [DllImport(GlfwDll, CallingConvention = CallingConvention.Cdecl, EntryPoint = "glfwGetVersion")] - public static extern void GetVersion(out int major, out int minor, out int rev); - - - /// - /// Returns the compile-time generated version string of the GLFW - /// library binary. It describes the version, platform, compiler and - /// any platform-specific compile-time options. - /// - /// - /// The compile-time generated version string of the GLFW library - /// binary. - /// - [DllImport(GlfwDll, CallingConvention = CallingConvention.Cdecl, EntryPoint = "glfwGetVersionString")] - public static extern NativeString GetVersionString(); - - /// - /// Creates a window and its associated OpenGL or OpenGL ES context. - /// Most of the options controlling how the window and its context - /// should be created are specified with window hints. - /// - /// - /// The desired width, in screen coordinates, of the window. This must - /// be greater than zero. - /// - /// - /// The desired height, in screen coordinates, of the window. This must - /// be greater than zero. - /// - /// - /// The initial window title. - /// - /// - /// The monitor to use for full screen mode, or Null for windowed mode. - /// - /// - /// The window whose context to share resources with, or Null to not share resources. - /// - /// - /// The handle of the created window, or Null if an error occurred. - /// - [DllImport(GlfwDll, CallingConvention = CallingConvention.Cdecl, EntryPoint = "glfwCreateWindow")] - public static extern IntPtr CreateWindow(int width, int height, [MarshalAs(UnmanagedType.LPStr)] string title, MonitorHandle monitor, IntPtr share); - - /// - /// Destroys the specified window and its context. On calling this - /// function, no further callbacks will be called for that window. - /// - /// - /// The window to destroy. - /// - [DllImport(GlfwDll, CallingConvention = CallingConvention.Cdecl, EntryPoint = "glfwDestroyWindow")] - public static extern void DestroyWindow(IntPtr window); - - /// - /// Processes events in the event queue and then returns immediately. - /// Processing events will cause the window and input callbacks - /// associated with those events to be called. - /// - [DllImport(GlfwDll, CallingConvention = CallingConvention.Cdecl, EntryPoint = "glfwPollEvents")] - public static extern void PollEvents(); - - /// - /// Sets hints for the next call to CreateWindow. The hints, once set, - /// retain their values until changed by a call to WindowHint or - /// DefaultWindowHints, or until the library is terminated. - /// - /// - /// The window hint to set. - /// - /// - /// The new value of the window hint. - /// - [DllImport(GlfwDll, CallingConvention = CallingConvention.Cdecl, EntryPoint = "glfwWindowHint")] - public static extern void WindowHint(WindowAttribute hint, int value); - - /// - /// Returns the value of the close flag of the specified window. - /// - /// - /// The window to query. - /// - /// - /// The value of the close flag. - /// - [DllImport(GlfwDll, CallingConvention = CallingConvention.Cdecl, EntryPoint = "glfwWindowShouldClose")] - public static extern bool WindowShouldClose(IntPtr window); - - [DllImport (GlfwDll, CallingConvention = CallingConvention.Cdecl, EntryPoint = "glfwSetWindowShouldClose")] - public static extern void SetWindowShouldClose (IntPtr window, int value); - - [DllImport (GlfwDll, CallingConvention = CallingConvention.Cdecl, EntryPoint = "glfwSetWindowTitle")] - public static extern void SetWindowTitle (IntPtr window, [MarshalAs (UnmanagedType.LPStr)] string title); - - /// - /// Creates a Vulkan surface for the specified window. - /// - /// - /// The Vulkan instance to create the surface in. - /// - /// - /// The window to create the surface for. - /// - /// - /// The allocator to use, or NULL to use the default allocator. - /// - /// - /// Where to store the handle of the surface. This is set to - /// VK_NULL_HANDLE if an error occurred. - /// - /// - /// Result.Success if successful, or a Vulkan error code if an error - /// occurred. - /// - [DllImport (GlfwDll, CallingConvention = CallingConvention.Cdecl, EntryPoint = "glfwCreateWindowSurface")] - public static extern int CreateWindowSurface(IntPtr instance, IntPtr window, IntPtr pAllocator, out ulong surface); - - /// - /// Returns an array of names of Vulkan instance extensions required by - /// GLFW for creating Vulkan surfaces for GLFW windows. If successful, - /// the list will always contains VK_KHR_surface, so if you don't - /// require any additional extensions you can pass this list directly - /// to the InstanceCreateInfo struct. - /// - /// - /// Where to store the number of extensions in the returned array. This - /// is set to zero if an error occurred. - /// - /// - /// An array of extension names, or Null if an error occurred. - /// - [DllImport(GlfwDll, CallingConvention = CallingConvention.Cdecl, EntryPoint = "glfwGetRequiredInstanceExtensions")] - public static extern IntPtr GetRequiredInstanceExtensions(out int count); - - /// - /// Sets the size callback of the specified window, which is called - /// when the window is resized. The callback is provided with the size, - /// in screen coordinates, of the client area of the window. - /// - /// - /// The window whose callback to set. - /// - /// - /// The new callback, or Null to remove the currently set callback. - /// - /// - [DllImport(GlfwDll, CallingConvention = CallingConvention.Cdecl, EntryPoint = "glfwSetWindowSizeCallback")] - public static extern WindowSizeDelegate SetWindowSizeCallback(IntPtr window, WindowSizeDelegate callback); - - /// - /// Sets the error callback, which is called with an error code and a - /// human-readable description each time a GLFW error occurs. - /// - /// - /// The new callback, or Null to remove the currently set callback. - /// - /// - /// The previously set callback, or Null if no callback was set. - /// - [DllImport(GlfwDll, CallingConvention = CallingConvention.Cdecl, EntryPoint = "glfwSetErrorCallback")] - public static extern ErrorDelegate SetErrorCallback(ErrorDelegate callback); - - /// - /// Returns an array of handles for all currently connected monitors. - /// The primary monitor is always first in the returned array. If no - /// monitors were found, this function returns Null. - /// - /// - /// Where to store the number of monitors in the returned array. This - /// is set to zero if an error occurred. - /// - /// - /// An array of monitor handles, or Null if no monitors were found or - /// if an error occurred. - /// - [DllImport(GlfwDll, CallingConvention = CallingConvention.Cdecl, EntryPoint = "glfwGetMonitors")] - public static extern IntPtr GetMonitors(out int count); - - /// - /// Returns the primary monitor. This is usually the monitor where - /// elements like the task bar or global menu bar are located. - /// - /// - /// The primary monitor, or Null if no monitors were found or if an - /// error occurred. - /// - [DllImport(GlfwDll, CallingConvention = CallingConvention.Cdecl, EntryPoint = "glfwGetPrimaryMonitor")] - public static extern MonitorHandle GetPrimaryMonitor(); - - /// - /// Returns the position, in screen coordinates, of the upper-left - /// corner of the specified monitor. - /// - /// - /// The monitor to query. - /// - /// - /// Returns the monitor x-coordinate. - /// - /// - /// Returns the monitor y-coordinate. - /// - [DllImport(GlfwDll, CallingConvention = CallingConvention.Cdecl, EntryPoint = "glfwGetMonitorPos")] - public static extern void GetMonitorPos(MonitorHandle monitor, out int xPos, out int yPos); - - /// - /// Returns the size, in millimetres, of the display area of the - /// specified monitor. - /// - /// - /// The monitor to query. - /// - /// - /// The width, in millimetres, of the monitor's display area. - /// - /// - /// The width, in millimetres, of the monitor's display area. - /// - [DllImport(GlfwDll, CallingConvention = CallingConvention.Cdecl, EntryPoint = "glfwGetMonitorPhysicalSize")] - public static extern void GetMonitorPhysicalSize(MonitorHandle monitor, out int widthMm, out int heightMm); - - /// - /// Returns a human-readable name, of the specified monitor. The name - /// typically reflects the make and model of the monitor and is not - /// guaranteed to be unique among the connected monitors. - /// - /// - /// The monitor to query. - /// - /// - /// The name of the monitor, or Null if an error occurred. - /// - [DllImport(GlfwDll, CallingConvention = CallingConvention.Cdecl, EntryPoint = "glfwGetMonitorName")] - public static extern NativeString GetMonitorName(MonitorHandle monitor); - - /// - /// Sets the monitor configuration callback, or removes the currently - /// set callback. This is called when a monitor is connected to or - /// disconnected from the system. - /// - /// - /// The new callback, or Null to remove the currently set callback. - /// - /// - /// The previously set callback, or NULL if no callback was set or the - /// library had not been initialized. - /// - [DllImport(GlfwDll, CallingConvention = CallingConvention.Cdecl, EntryPoint = "glfwSetMonitorCallback")] - public static extern MonitorEventDelegate SetMonitorCallback(MonitorEventDelegate callback); - - /// - /// Returns an array of all video modes supported by the specified - /// monitor. The returned array is sorted in ascending order, first by - /// color bit depth (the sum of all channel depths) and then by - /// resolution area (the product of width and height). - /// - /// - /// The monitor to query. - /// - /// - /// Tthe number of video modes in the returned array. This is set to - /// zero if an error occurred. - /// - /// - /// An array of video modes, or Null if an error occurred. - /// - [DllImport(GlfwDll, CallingConvention = CallingConvention.Cdecl, EntryPoint = "glfwGetVideoModes")] - public static extern IntPtr GetVideoModes(MonitorHandle monitor, out int count); - - /// - /// Returns the current video mode of the specified monitor. If you - /// have created a full screen window for that monitor, the return - /// value will depend on whether that window is iconified. - /// - /// - /// The monitor to query. - /// - /// - /// A wrapped pointer to the current mode of the monitor, or Null if - /// an error occurred. - /// - [DllImport(GlfwDll, CallingConvention = CallingConvention.Cdecl, EntryPoint = "glfwGetVideoMode")] - public static extern VideoModePointer GetVideoMode(MonitorHandle monitor); - - /// - /// Generates a 256-element gamma ramp from the specified exponent and - /// then calls glfwSetGammaRamp with it. The value must be a finite - /// number greater than zero. - /// - /// - /// The monitor whose gamma ramp to set. - /// - /// - /// The desired exponent. - /// - [DllImport(GlfwDll, CallingConvention = CallingConvention.Cdecl, EntryPoint = "glfwSetGamma")] - public static extern void SetGamma(MonitorHandle monitor, float gamma); - - [DllImport(GlfwDll, CallingConvention = CallingConvention.Cdecl, EntryPoint = "glfwGetInputMode")] - public static extern int GetInputMode(IntPtr window, int mode); - - [DllImport(GlfwDll, CallingConvention = CallingConvention.Cdecl, EntryPoint = "glfwSetInputMode")] - public static extern void SetInputMode(IntPtr window, int mode, int value); - - /// - /// Returns the localized name of the specified printable key. This is - /// intended for displaying key bindings to the user. - /// - /// - /// The key to query, or Key.Unknown. - /// - /// - /// The scancode of the key to query, if key is Key.Unknown. - /// - /// - /// The localized name of the key, or Null. - /// - [DllImport(GlfwDll, CallingConvention = CallingConvention.Cdecl, EntryPoint = "glfwGetKeyName")] - public static extern NativeString GetKeyName(Key key, int scancode); - - [DllImport(GlfwDll, CallingConvention = CallingConvention.Cdecl, EntryPoint = "glfwGetKey")] - public static extern InputAction GetKey(IntPtr window, Key key); - - [DllImport(GlfwDll, CallingConvention = CallingConvention.Cdecl, EntryPoint = "glfwGetMouseButton")] - public static extern InputAction GetMouseButton(IntPtr window, MouseButton button); - - [DllImport(GlfwDll, CallingConvention = CallingConvention.Cdecl, EntryPoint = "glfwGetCursorPos")] - public static extern void GetCursorPosition(IntPtr window, out double xPosition, out double yPosition); - - [DllImport(GlfwDll, CallingConvention = CallingConvention.Cdecl, EntryPoint = "glfwSetCursorPos")] - public static extern void SetCursorPosition(IntPtr window, double xPosition, double yPosition); - - [DllImport(GlfwDll, CallingConvention = CallingConvention.Cdecl, EntryPoint = "glfwSetKeyCallback")] - public static extern KeyDelegate SetKeyCallback(IntPtr window, KeyDelegate callback); - - [DllImport(GlfwDll, CallingConvention = CallingConvention.Cdecl, EntryPoint = "glfwSetCharCallback")] - public static extern KeyDelegate SetCharCallback(IntPtr window, CharDelegate callback); - - /// - /// Sets a callback for Mouse movement events. Use this for full - /// mouse path resolution between PollEvents() calls. - /// From GLFW Documentation: The callback functions receives the - /// cursor position, measured in screen coordinates but relative to the - /// top-left corner of the window client area. On platforms that - /// provide it, the full sub-pixel cursor position is passed on. - /// - /// - /// The previously set callback, or NULL if no callback was set or the - /// library had not been initialized. - /// - [DllImport(GlfwDll, CallingConvention = CallingConvention.Cdecl, EntryPoint = "glfwSetCursorPosCallback")] - public static extern CursorPosDelegate SetCursorPosCallback(IntPtr window, CursorPosDelegate callback); - - /// - /// Sets a Callback for Button Events (i.e. clicks). This also - /// detects mouse press and release events done between PollEvents() - /// calls. - /// From GLFW Documentation: Whenever you poll state, you risk - /// missing the state change you are looking for. If a pressed mouse - /// button is released again before you poll its state, you will have - /// missed the button press. The recommended solution for this is to - /// use a mouse button callback, but there is also the - /// GLFW_STICKY_MOUSE_BUTTONS input mode. - /// - /// - /// The previously set callback, or NULL if no callback was set or the - /// library had not been initialized. - /// - [DllImport(GlfwDll, CallingConvention = CallingConvention.Cdecl, EntryPoint = "glfwSetMouseButtonCallback")] - public static extern MouseButtonDelegate SetMouseButtonPosCallback(IntPtr window, MouseButtonDelegate callback); - - /// - /// Sets a Callback for Mouse Scrolling Events. (i.e. scroll wheel) - /// There is no polling support for this, so if youre interested in the wheel, you have to set this callback - /// NOTE: your normal desktop mouse variant likely only reports Y-Coordinate - /// - /// - /// The previously set callback, or NULL if no callback was set or the - /// library had not been initialized. - /// - [DllImport(GlfwDll, CallingConvention = CallingConvention.Cdecl, EntryPoint = "glfwSetScrollCallback")] - public static extern ScrollDelegate SetScrollCallback(IntPtr window, ScrollDelegate callback); - - /// - /// Returns an array of names of Vulkan instance extensions required by - /// GLFW for creating Vulkan surfaces for GLFW windows. If successful, - /// the list will always contains VK_KHR_surface, so if you don't - /// require any additional extensions you can pass this list directly - /// to the InstanceCreateInfo struct. - /// - /// - /// An array of extension names, or Null if an error occurred. - /// - public static string[] GetRequiredInstanceExtensions() - { - IntPtr names = GetRequiredInstanceExtensions(out int count); - - string[] result = new string[count]; - - for (int nameIndex = 0; nameIndex < count; nameIndex++) - { - IntPtr name = Marshal.ReadIntPtr (names, nameIndex * Marshal.SizeOf()); - result[nameIndex] = Marshal.PtrToStringAnsi(name); - } - - return result; - } - - /// - /// Returns an array of handles for all currently connected monitors. - /// The primary monitor is always first in the returned array. If no - /// monitors were found, this function returns Null. - /// - /// - /// An array of monitor handles, or Null if no monitors were found or - /// if an error occurred. - /// - public static MonitorHandle[] GetMonitors() - { - IntPtr monitors = GetMonitors(out int count); - - var result = new MonitorHandle[count]; - - for (int i = 0; i < count; i++) - result[i] = new MonitorHandle(Marshal.ReadIntPtr(monitors, i)); - - return result; - } - - /// - /// Returns an array of all video modes supported by the specified - /// monitor. The returned array is sorted in ascending order, first by - /// color bit depth (the sum of all channel depths) and then by - /// resolution area (the product of width and height). - /// - /// - /// The monitor to query. - /// - /// - /// An array of video modes, or Null if an error occurred. - /// - public static VideoMode[] GetVideoModes(MonitorHandle monitor) - { - IntPtr videoModes = GetVideoModes(monitor, out int count); - - var result = new VideoMode[count]; - - for (int i = 0; i < count; i++) - result[i] = Marshal.PtrToStructure(Marshal.ReadIntPtr(videoModes, i)); - - return result; - } - - /// - /// This function retrieves the version number of the GLFW library. - /// - /// - /// The version number of the GLFW library. - /// - public static Version GetVersion() - { - GetVersion(out int major, out int minor, out int revision); - - return new Version(major, minor, revision); - } - - [DllImport (GlfwDll, CallingConvention = CallingConvention.Cdecl, EntryPoint = "glfwCreateStandardCursor")] - public static extern IntPtr CreateStandardCursor (CursorShape shape); - - [DllImport (GlfwDll, CallingConvention = CallingConvention.Cdecl, EntryPoint = "glfwDestroyCursor")] - public static extern void DestroyCursor (IntPtr cursor); - - [DllImport (GlfwDll, CallingConvention = CallingConvention.Cdecl, EntryPoint = "glfwSetCursor")] - public static extern void SetCursor (IntPtr window, IntPtr cursor); - } -} diff --git a/vke/src/glfw/InputAction.cs b/vke/src/glfw/InputAction.cs deleted file mode 100644 index 3ee57f7..0000000 --- a/vke/src/glfw/InputAction.cs +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright (c) 2019 Andrew Armstrong/FacticiusVir -// Copyright (c) 2019 Jean-Philippe Bruyère -// -// This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) -namespace Glfw -{ - /// - /// Represents the action of an input key event or the state of a key. - /// - public enum InputAction - { - /// - /// The key was released or is not pressed. - /// - Release = 0, - /// - /// The key was or is pressed. - /// - Press = 1, - /// - /// The key has been held down long enough to repeat. - /// - Repeat = 2 - } -} diff --git a/vke/src/glfw/Key.cs b/vke/src/glfw/Key.cs deleted file mode 100644 index 1e8c19d..0000000 --- a/vke/src/glfw/Key.cs +++ /dev/null @@ -1,134 +0,0 @@ -// Copyright (c) 2019 Andrew Armstrong/FacticiusVir -// Copyright (c) 2019 Jean-Philippe Bruyère -// -// This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) -namespace Glfw -{ - /// - /// Represents a key on a keyboard. - /// - public enum Key - { - Unknown = -1, - Space = 32, - Apostrophe = 39, - Comma = 44, - Minus = 45, - Period = 46, - Slash = 47, - Num0 = 48, - Num1 = 49, - Num2 = 50, - Num3 = 51, - Num4 = 52, - Num5 = 53, - Num6 = 54, - Num7 = 55, - Num8 = 56, - Num9 = 57, - Semicolon = 59, - Equal = 61, - A = 65, - B = 66, - C = 67, - D = 68, - E = 69, - F = 70, - G = 71, - H = 72, - I = 73, - J = 74, - K = 75, - L = 76, - M = 77, - N = 78, - O = 79, - P = 80, - Q = 81, - R = 82, - S = 83, - T = 84, - U = 85, - V = 86, - W = 87, - X = 88, - Y = 89, - Z = 90, - LeftBracket = 91, - Backslash = 92, - RightBracket = 93, - GraveAccent = 96, - World1 = 161, - World2 = 162, - Escape = 256, - Enter = 257, - Tab = 258, - Backspace = 259, - Insert = 260, - Delete = 261, - Right = 262, - Left = 263, - Down = 264, - Up = 265, - PageUp = 266, - PageDown = 267, - Home = 268, - End = 269, - CapsLock = 280, - ScrollLock = 281, - NumLock = 282, - PrintScreen = 283, - Pause = 284, - F1 = 290, - F2 = 291, - F3 = 292, - F4 = 293, - F5 = 294, - F6 = 295, - F7 = 296, - F8 = 297, - F9 = 298, - F10 = 299, - F11 = 300, - F12 = 301, - F13 = 302, - F14 = 303, - F15 = 304, - F16 = 305, - F17 = 306, - F18 = 307, - F19 = 308, - F20 = 309, - F21 = 310, - F22 = 311, - F23 = 312, - F24 = 313, - F25 = 314, - Keypad0 = 320, - Keypad1 = 321, - Keypad2 = 322, - Keypad3 = 323, - Keypad4 = 324, - Keypad5 = 325, - Keypad6 = 326, - Keypad7 = 327, - Keypad8 = 328, - Keypad9 = 329, - KeypadDecimal = 330, - KeypadDivide = 331, - KeypadMultiply = 332, - KeypadSubtract = 333, - KeypadAdd = 334, - KeypadEnter = 335, - KeypadEqual = 336, - LeftShift = 340, - LeftControl = 341, - LeftAlt = 342, - LeftSuper = 343, - RightShift = 344, - RightControl = 345, - RightAlt = 346, - RightSuper = 347, - Menu = 348, - } -} diff --git a/vke/src/glfw/Modifier.cs b/vke/src/glfw/Modifier.cs deleted file mode 100644 index 98205c7..0000000 --- a/vke/src/glfw/Modifier.cs +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright (c) 2019 Andrew Armstrong/FacticiusVir -// Copyright (c) 2019 Jean-Philippe Bruyère -// -// This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) -using System; - -namespace Glfw -{ - /// - /// Bitmask indicating modifer keys. - /// - [Flags] - public enum Modifier - { - Shift = 0x1, - Control = 0x2, - Alt = 0x4, - Super = 0x8, - } -} \ No newline at end of file diff --git a/vke/src/glfw/MonitorEvent.cs b/vke/src/glfw/MonitorEvent.cs deleted file mode 100644 index d93397b..0000000 --- a/vke/src/glfw/MonitorEvent.cs +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright (c) 2019 Andrew Armstrong/FacticiusVir -// Copyright (c) 2019 Jean-Philippe Bruyère -// -// This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) -namespace Glfw -{ - /// - /// Events that may be raised from a monitor callback. - /// - public enum MonitorEvent - { - /// - /// The monitor was connected. - /// - Connected = 0x00040001, - /// - /// The monitor was disconnected. - /// - Disconnected = 0x00040002 - } -} diff --git a/vke/src/glfw/MonitorHandle.cs b/vke/src/glfw/MonitorHandle.cs deleted file mode 100644 index 38ed035..0000000 --- a/vke/src/glfw/MonitorHandle.cs +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright (c) 2019 Andrew Armstrong/FacticiusVir -// Copyright (c) 2019 Jean-Philippe Bruyère -// -// This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) -using System; - -namespace Glfw -{ - /// - /// Opaque monitor handle. - /// - public struct MonitorHandle - { - readonly IntPtr handle; - - internal MonitorHandle(IntPtr handle) - { - this.handle = handle; - } - /// - /// Gets the underlying native pointer to the monitor object. - /// - public IntPtr RawHandle => handle; - /// - /// A read-only field that represents a MonitorHandle that has been - /// inititalised to zero. - /// - public static readonly MonitorHandle Zero = new MonitorHandle (IntPtr.Zero); - } -} diff --git a/vke/src/glfw/MouseButton.cs b/vke/src/glfw/MouseButton.cs deleted file mode 100644 index b29184a..0000000 --- a/vke/src/glfw/MouseButton.cs +++ /dev/null @@ -1,61 +0,0 @@ -// Copyright (c) 2019 Andrew Armstrong/FacticiusVir -// Copyright (c) 2019 Jean-Philippe Bruyère -// -// This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) -namespace Glfw -{ - /// - /// The index and name of mouse buttons for callbacks. - /// - public enum MouseButton - { - /// - /// The first mouse button. - /// - Button1 = 0, - /// - /// The second mouse button. - /// - Button2 = 1, - /// - /// The third mouse button. - /// - Button3 = 2, - /// - /// The fourth mouse button. - /// - Button4 = 3, - /// - /// The fifth mouse button. - /// - Button5 = 4, - /// - /// The sixth mouse button. - /// - Button6 = 5, - /// - /// The seven mouse button. - /// - Button7 = 6, - /// - /// The eighth mouse button. - /// - Button8 = 7, - /// - /// The left mouse button. - /// - Left = Button1, - /// - /// The right mouse button. - /// - Right = Button2, - /// - /// The middle mouse button. - /// - Middle = Button3, - /// - /// The highest-indexed mouse button. - /// - Last = Button8 - } -} diff --git a/vke/src/glfw/NativeString.cs b/vke/src/glfw/NativeString.cs deleted file mode 100644 index 02181cb..0000000 --- a/vke/src/glfw/NativeString.cs +++ /dev/null @@ -1,42 +0,0 @@ -using System; -using System.Runtime.InteropServices; - -// Copyright (c) 2019 Andrew Armstrong/FacticiusVir -// Copyright (c) 2019 Jean-Philippe Bruyère -// -// This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) -namespace Glfw -{ - /// - /// Wraps a pointer to a native, null-terminated ANSI string. - /// - public struct NativeString - { - internal NativeString(IntPtr pointer) - { - this.pointer = pointer; - } - - readonly IntPtr pointer; - - /// - /// Gets the marshalled string value for this native string. - /// - public string Value => IsNull ? throw new NullReferenceException () : Marshal.PtrToStringAnsi (this.pointer); - /// - /// Gets a value indicating whether the pointer wrapped by this - /// instance is null. - /// - public bool IsNull => pointer == IntPtr.Zero; - - /// - /// The underlying pointer wrapped by this instance. - /// - public IntPtr RawPointer => pointer; - - public override string ToString() - { - return Value; - } - } -} diff --git a/vke/src/glfw/VideoMode.cs b/vke/src/glfw/VideoMode.cs deleted file mode 100644 index baeb196..0000000 --- a/vke/src/glfw/VideoMode.cs +++ /dev/null @@ -1,43 +0,0 @@ -using System.Runtime.InteropServices; - -namespace Glfw -{ - /// - /// Represents a single video mode. - /// - [StructLayout(LayoutKind.Sequential)] - public struct VideoMode - { - private readonly int width; - private readonly int height; - private readonly int redBits; - private readonly int greenBits; - private readonly int blueBits; - - /// - /// The resolution, in screen coordinates, of the video mode. - /// - public (int Width, int Height) Resolution => (this.width, this.height); - - /// - /// The bit depth of the red channel of the video mode. - /// - public (int Red, int Green, int Blue) Bits => (this.redBits, this.greenBits, this.blueBits); - - /// - /// The refresh rate, in Hz, of the video mode. - /// - public int RefreshRate; - - /// - /// Returns a string representation of this video mode. - /// - /// - /// A string representation of this video mode. - /// - public override string ToString() - { - return $"[Resolution: {this.Resolution}, Bit Depth: {this.Bits}, Refresh Rate: {this.RefreshRate}Hz]"; - } - } -} diff --git a/vke/src/glfw/VideoModePointer.cs b/vke/src/glfw/VideoModePointer.cs deleted file mode 100644 index 66631c6..0000000 --- a/vke/src/glfw/VideoModePointer.cs +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright (c) 2019 Andrew Armstrong/FacticiusVir -// Copyright (c) 2019 Jean-Philippe Bruyère -// -// This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) -using System; -using System.Runtime.InteropServices; - -namespace Glfw -{ - /// - /// Wraps a pointer to a VideoMode struct. - /// - public struct VideoModePointer - { - private readonly IntPtr pointer; - internal VideoModePointer (IntPtr pointer) - { - this.pointer = pointer; - } - /// - /// Gets the VideoMode value at the referenced memory location. - /// - public VideoMode Value => IsNull ? throw new NullReferenceException() : Marshal.PtrToStructure(pointer); - /// - /// Gets a value indicating whether the pointer wrapped by this - /// instance is null. - /// - public bool IsNull => pointer == IntPtr.Zero; - /// - /// The underlying pointer wrapped by this instance. - /// - public IntPtr RawPointer => pointer; - } -} diff --git a/vke/src/glfw/WindowAttribute.cs b/vke/src/glfw/WindowAttribute.cs deleted file mode 100644 index f772667..0000000 --- a/vke/src/glfw/WindowAttribute.cs +++ /dev/null @@ -1,184 +0,0 @@ -// Copyright (c) 2019 Andrew Armstrong/FacticiusVir -// Copyright (c) 2019 Jean-Philippe Bruyère -// -// This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) -namespace Glfw -{ - /// - /// Attributes of a window or its framebuffer or context, that can be - /// configured/queried at runtime or hinted at creation. - /// - public enum WindowAttribute - { - /// - /// Whether the specified window has input focus. This hint is ignored - /// for full screen and initially hidden windows. - /// - Focused = 0x00020001, - /// - /// Whether the specified window is iconified (minimized). - /// - Iconified = 0x00020002, - /// - /// Whether the specified window is resizable by the user. This is set - /// on creation. - /// - Resizable = 0x00020003, - /// - /// Whether the specified window is visible. - /// - Visible = 0x00020004, - /// - /// Whether the specified window has decorations such as a border, a - /// close widget, etc. This is set on creation. - /// - Decorated = 0x00020005, - /// - /// Whether the full screen window will automatically iconify and - /// restore the previous default framebuffer on input focus loss. This hint is - /// ignored for windowed mode windows. - /// - AutoIconify = 0x00020006, - /// - /// Whether the windowed mode window will be floating above other - /// regular windows, also called topmost or always-on-top. This is - /// intended primarily for debugging purposes and cannot be used to - /// implement proper full screen windows. This hint is ignored for full - /// screen windows. - /// - Floating = 0x00020007, - /// - /// Whether the specified window is maximized. - /// - Maximized = 0x00020008, - /// - /// The bit depth of the red channel of the default framebuffer. - /// - RedBits = 0x00021001, - /// - /// The bit depth of the green channel of the default framebuffer. - /// - GreenBits = 0x00021002, - /// - /// The bit depth of the blue channel of the default framebuffer. - /// - BlueBits = 0x00021003, - /// - /// The bit depth of the alpha channel of the default framebuffer. - /// - AlphaBits = 0x00021004, - /// - /// The bit depth of the depth channel of the default framebuffer. - /// - DepthBits = 0x00021005, - /// - /// The bit depth of the stencil channel of the default framebuffer. - /// - StencilBits = 0x00021006, - /// - /// The desired bit depth of the red channel of the accumulation - /// buffer. Accumulation buffers are a legacy OpenGL feature and - /// should not be used in new code. - /// - AccumRedBits = 0x00021007, - /// - /// The desired bit depth of the green channel of the accumulation - /// buffer. Accumulation buffers are a legacy OpenGL feature and - /// should not be used in new code. - /// - AccumGreenBits = 0x00021008, - /// - /// The desired bit depth of the blue channel of the accumulation - /// buffer. Accumulation buffers are a legacy OpenGL feature and - /// should not be used in new code. - /// - AccumBlueBits = 0x00021009, - /// - /// The desired bit depth of the alpha channel of the accumulation - /// buffer. Accumulation buffers are a legacy OpenGL feature and - /// should not be used in new code. - /// - AccumAlphaBits = 0x0002100A, - /// - /// The desired number of auxiliary buffers. Auxiliary buffers are a - /// legacy OpenGL feature and should not be used in new code. - /// - AuxBuffers = 0x0002100B, - /// - /// Whether to use stereoscopic rendering. - /// - Stereo = 0x0002100C, - /// - /// The desired number of samples to use for multisampling. Zero - /// disables multisampling. - /// - Samples = 0x0002100D, - /// - /// Whether the framebuffer should be sRGB capable. - /// - SrgbCapable = 0x0002100E, - /// - /// The desired refresh rate for full screen windows. This hint is - /// ignored for windowed mode windows. - /// - RefreshRate = 0x0002100F, - /// - /// Whether the framebuffer should be double buffered. - /// - DoubleBuffer = 0x00021010, - /// - /// Specifies which client API to create the context for. - /// - ClientApi = 0x00022001, - /// - /// Specifies the major component of the client API version of the - /// window's context. - /// - ContextVersionMajor = 0x00022002, - /// - /// Specifies the minor component of the client API version of the - /// window's context. - /// - ContextVersionMinor = 0x00022003, - /// - /// Specifies the revision component of the client API version of the - /// window's context. - /// - ContextRevision = 0x00022004, - /// - /// The robustness strategy used by the context. - /// - ContextRobustness = 0x00022005, - /// - /// Specifies whether the OpenGL context should be forward-compatible, - /// i.e. one where all functionality deprecated in the requested - /// version of OpenGL is removed. If OpenGL ES is requested, this hint - /// is ignored. - /// - OpenGlForwardCompat = 0x00022006, - /// - /// Specifies whether to create a debug OpenGL context, which may have - /// additional error and performance issue reporting functionality. If - /// OpenGL ES is requested, this hint is ignored. - /// - OpenGlDebugContext = 0x00022007, - /// - /// The OpenGL profile used by the context. - /// - OpenGlProfile = 0x00022008, - /// - /// Specifies the release behavior to be used by the context. - /// - ContextReleaseBehavior = 0x00022009, - /// - /// Specifies whether errors should be generated by the context. If - /// enabled, situations that would have generated errors instead cause - /// undefined behavior. - /// - ContextNoError = 0x0002200A, - /// - /// The context creation API used to create the window's context. - /// - ContextCreationApi = 0x0002200B - } -} diff --git a/vke/vke.csproj b/vke/vke.csproj index 2e3a86b..c81f77b 100644 --- a/vke/vke.csproj +++ b/vke/vke.csproj @@ -10,14 +10,17 @@ https://github.com/jpbruyere/vke.net vulkan game engine compute glfw c# $(VkePackageVersion) + True true + False https://github.com/jpbruyere/vke.net/blob/master/README.md MIT Jean-Philippe Bruyère + false @@ -49,11 +52,12 @@ + - + -- 2.47.3