From d22aa8f59560e000569407735c86801a00deb29f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jean-Philippe=20Bruy=C3=A8re?= Date: Thu, 12 Sep 2019 21:09:17 +0200 Subject: [PATCH] netstandard for libs, netcoreapp for application (or net47x) --- .travis.yml | 10 ++++------ SpirVTasks/SpirVTasks.csproj | 4 ++-- SpirVTasks/SpirVTasks.targets | 2 +- addons/Directory.Build.props | 8 ++++---- addons/DistanceFieldFont/BMFont.cs | 2 +- .../DistanceFieldFont/DistanceFieldFont.csproj | 3 +-- addons/VkvgPipeline/VkvgPipeline.cs | 2 +- addons/VkvgPipeline/VkvgPipeline.csproj | 3 +-- addons/gltfLoader/PbrModel.cs | 2 +- addons/gltfLoader/PbrModelSeparateTextures.cs | 2 +- addons/gltfLoader/PbrModelTexArray.cs | 2 +- addons/gltfLoader/glTFLoader.cs | 4 ++-- addons/gltfLoader/gltfLoader.csproj | 2 +- samples/Directory.Build.props | 8 ++++---- .../DistanceFieldFontTest.csproj | 6 +----- samples/DistanceFieldFontTest/Program.cs | 2 +- samples/Model/Model.csproj | 2 -- samples/Model/main.cs | 2 +- samples/Textured/Textured.csproj | 2 -- samples/Textured/main.cs | 2 +- samples/TexturedCube/TexturedCube.csproj | 1 - samples/TexturedCube/main.cs | 2 +- samples/Triangle/Triangle.csproj | 5 ++--- samples/Triangle/main.cs | 2 +- samples/common/CrowWin.cs | 2 +- samples/compute/compute.csproj | 3 +-- samples/compute/delaunay.cs | 2 +- samples/deferred/DeferredPbrRenderer.cs | 2 +- samples/deferred/EnvironmentPipeline.cs | 2 +- samples/deferred/deferred.csproj | 3 +-- samples/deferred/main-crow.cs | 2 +- samples/deferred/main.cs | 2 +- samples/deferred/shadowMapRenderer.cs | 2 +- samples/pbr/EnvironmentPipeline.cs | 2 +- samples/pbr/PbrModel.cs | 2 +- samples/pbr/PbrPipeline.cs | 2 +- samples/pbr/main.cs | 2 +- samples/pbr/pbr.csproj | 1 - vke/src/ExtensionMethods.cs | 5 +++-- vke/src/FixedUtf8String.cs | 18 ++++++------------ vke/src/MemoryPool.cs | 4 ++-- vke/src/ResourceManager.cs | 2 +- vke/src/ShaderInfo.cs | 2 +- vke/src/SpecializationConstant.cs | 2 +- vke/src/Utils.cs | 2 +- vke/src/VertexAttribute.cs | 2 +- vke/src/VkFormatSize.cs | 2 +- vke/src/VkWindow.cs | 4 ++-- vke/src/base/Activable.cs | 4 ++-- vke/src/base/Buffer.cs | 4 ++-- vke/src/base/CommandBuffer.cs | 4 ++-- vke/src/base/CommandPool.cs | 4 ++-- vke/src/base/ComputePipeline.cs | 4 ++-- vke/src/base/DebuDrawPipeline.cs | 2 +- vke/src/base/DebugReport.cs | 4 ++-- vke/src/base/DebugUtilsMessenger.cs | 4 ++-- vke/src/base/DescriptorPool.cs | 4 ++-- vke/src/base/DescriptorSet.cs | 2 +- vke/src/base/DescriptorSetLayout.cs | 4 ++-- vke/src/base/DescriptorSetWrites.cs | 4 ++-- vke/src/base/Device.cs | 4 ++-- vke/src/base/FrameBuffer.cs | 4 ++-- vke/src/base/GPUBuffer.cs | 2 +- vke/src/base/GraphicPipeline.cs | 4 ++-- vke/src/base/GraphicPipelineConfig.cs | 4 ++-- vke/src/base/HostBuffer.cs | 4 ++-- vke/src/base/Image.cs | 4 ++-- vke/src/base/Instance.cs | 4 ++-- vke/src/base/PhysicalDevice.cs | 8 +++++--- vke/src/base/Pipeline.cs | 4 ++-- vke/src/base/PipelineCache.cs | 4 ++-- vke/src/base/PipelineLayout.cs | 4 ++-- vke/src/base/QueryPool.cs | 4 ++-- vke/src/base/Queue.cs | 4 ++-- vke/src/base/RenderPass.cs | 4 ++-- vke/src/base/Resource.cs | 4 ++-- vke/src/base/SubPass.cs | 2 +- vke/src/base/SwapChain.cs | 4 ++-- vke/src/gl.cs | 2 +- vke/src/ktx.cs | 2 +- vke/src/model/Model.cs | 2 +- vke/vke.csproj | 10 +++++----- 82 files changed, 132 insertions(+), 152 deletions(-) diff --git a/.travis.yml b/.travis.yml index 610673e..ce0f577 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,12 +1,10 @@ language: csharp -dist: xenial +dist: bionic -dotnet: 2.1.502 +dotnet: 2.2.401-1 mono: latest script: - - nuget restore - - msbuild - - dotnet restore - - dotnet build + - msbuild /t:restore + - msbuild diff --git a/SpirVTasks/SpirVTasks.csproj b/SpirVTasks/SpirVTasks.csproj index 314ddc7..2c6a7f5 100644 --- a/SpirVTasks/SpirVTasks.csproj +++ b/SpirVTasks/SpirVTasks.csproj @@ -1,7 +1,7 @@ - net471;netstandard2.0 - 0.1.9 + netstandard2.0 + 0.1.10 MSBuild addon to compile and embed spirV shaders SpirVTasks diff --git a/SpirVTasks/SpirVTasks.targets b/SpirVTasks/SpirVTasks.targets index 690712f..9138d21 100644 --- a/SpirVTasks/SpirVTasks.targets +++ b/SpirVTasks/SpirVTasks.targets @@ -1,5 +1,5 @@ - + diff --git a/addons/Directory.Build.props b/addons/Directory.Build.props index 224a27a..20d44d4 100644 --- a/addons/Directory.Build.props +++ b/addons/Directory.Build.props @@ -3,7 +3,7 @@ $(MSBuildThisFileDirectory)../ true - net471;netstandard2.0 + netstandard2.0 https://github.com/jpbruyere/vke.net MIT @@ -27,10 +27,10 @@ - + - - + + diff --git a/addons/DistanceFieldFont/BMFont.cs b/addons/DistanceFieldFont/BMFont.cs index 824d265..9b0a704 100644 --- a/addons/DistanceFieldFont/BMFont.cs +++ b/addons/DistanceFieldFont/BMFont.cs @@ -5,7 +5,7 @@ using System; using System.Collections.Generic; using System.IO; using System.Reflection; -using VK; +using Vulkan; namespace vke.DistanceFieldFont { /// diff --git a/addons/DistanceFieldFont/DistanceFieldFont.csproj b/addons/DistanceFieldFont/DistanceFieldFont.csproj index a131f27..69eb42c 100644 --- a/addons/DistanceFieldFont/DistanceFieldFont.csproj +++ b/addons/DistanceFieldFont/DistanceFieldFont.csproj @@ -1,6 +1,5 @@ - - + CVKL.DistanceFieldFont CVKL.DistanceFieldFont diff --git a/addons/VkvgPipeline/VkvgPipeline.cs b/addons/VkvgPipeline/VkvgPipeline.cs index 62e852b..6507078 100644 --- a/addons/VkvgPipeline/VkvgPipeline.cs +++ b/addons/VkvgPipeline/VkvgPipeline.cs @@ -4,7 +4,7 @@ using System; using System.Numerics; using vke; -using VK; +using Vulkan; namespace VkvgPipeline { diff --git a/addons/VkvgPipeline/VkvgPipeline.csproj b/addons/VkvgPipeline/VkvgPipeline.csproj index 3d07598..0afcfa2 100644 --- a/addons/VkvgPipeline/VkvgPipeline.csproj +++ b/addons/VkvgPipeline/VkvgPipeline.csproj @@ -1,6 +1,5 @@ - - + CVKL.vkvgPipeline CVKL.vkvgPipeline diff --git a/addons/gltfLoader/PbrModel.cs b/addons/gltfLoader/PbrModel.cs index 11f28b5..7fe2d84 100644 --- a/addons/gltfLoader/PbrModel.cs +++ b/addons/gltfLoader/PbrModel.cs @@ -5,7 +5,7 @@ using System.Diagnostics; using System.Numerics; using System.Runtime.InteropServices; -using VK; +using Vulkan; using System.Collections.Generic; namespace vke.glTF { diff --git a/addons/gltfLoader/PbrModelSeparateTextures.cs b/addons/gltfLoader/PbrModelSeparateTextures.cs index de2f67a..90215c6 100644 --- a/addons/gltfLoader/PbrModelSeparateTextures.cs +++ b/addons/gltfLoader/PbrModelSeparateTextures.cs @@ -5,7 +5,7 @@ using System; using System.Diagnostics; using System.Numerics; using System.Runtime.InteropServices; -using VK; +using Vulkan; namespace vke.glTF { /// diff --git a/addons/gltfLoader/PbrModelTexArray.cs b/addons/gltfLoader/PbrModelTexArray.cs index 7c07de0..8ac9d0f 100644 --- a/addons/gltfLoader/PbrModelTexArray.cs +++ b/addons/gltfLoader/PbrModelTexArray.cs @@ -4,7 +4,7 @@ using System.Diagnostics; using System.Numerics; using System.Runtime.InteropServices; -using VK; +using Vulkan; namespace vke.glTF { /// diff --git a/addons/gltfLoader/glTFLoader.cs b/addons/gltfLoader/glTFLoader.cs index 936db08..50ad8dc 100644 --- a/addons/gltfLoader/glTFLoader.cs +++ b/addons/gltfLoader/glTFLoader.cs @@ -8,14 +8,14 @@ using System.Runtime.InteropServices; using glTFLoader; using GL = glTFLoader.Schema; -using VK; +using Vulkan; using System.Collections.Generic; using System.IO; namespace vke.glTF { - using static VK.Utils; + using static Vulkan.Utils; using static vke.Model; /// diff --git a/addons/gltfLoader/gltfLoader.csproj b/addons/gltfLoader/gltfLoader.csproj index a439773..543c3bf 100644 --- a/addons/gltfLoader/gltfLoader.csproj +++ b/addons/gltfLoader/gltfLoader.csproj @@ -1,5 +1,5 @@ - + CVKL.gltfLoader CVKL.gltfLoader diff --git a/samples/Directory.Build.props b/samples/Directory.Build.props index 8c1d092..31d7523 100644 --- a/samples/Directory.Build.props +++ b/samples/Directory.Build.props @@ -3,7 +3,7 @@ $(MSBuildThisFileDirectory)../ true - net471;netstandard2.0 + net471 https://github.com/jpbruyere/vke.net MIT @@ -26,10 +26,10 @@ - + - - + + diff --git a/samples/DistanceFieldFontTest/DistanceFieldFontTest.csproj b/samples/DistanceFieldFontTest/DistanceFieldFontTest.csproj index c603527..ce23dc6 100644 --- a/samples/DistanceFieldFontTest/DistanceFieldFontTest.csproj +++ b/samples/DistanceFieldFontTest/DistanceFieldFontTest.csproj @@ -1,9 +1,5 @@ - - + - - - diff --git a/samples/DistanceFieldFontTest/Program.cs b/samples/DistanceFieldFontTest/Program.cs index 6ba6039..3c16773 100644 --- a/samples/DistanceFieldFontTest/Program.cs +++ b/samples/DistanceFieldFontTest/Program.cs @@ -3,7 +3,7 @@ using System.Numerics; using System.Runtime.InteropServices; using Glfw; -using VK; +using Vulkan; using vke; using vke.DistanceFieldFont; diff --git a/samples/Model/Model.csproj b/samples/Model/Model.csproj index d6da2bb..6ad34e9 100644 --- a/samples/Model/Model.csproj +++ b/samples/Model/Model.csproj @@ -1,7 +1,5 @@ - - diff --git a/samples/Model/main.cs b/samples/Model/main.cs index dbea068..9acc570 100644 --- a/samples/Model/main.cs +++ b/samples/Model/main.cs @@ -5,7 +5,7 @@ using System.Numerics; using System.Runtime.InteropServices; using vke; using vke.glTF; -using VK; +using Vulkan; namespace ModelSample { diff --git a/samples/Textured/Textured.csproj b/samples/Textured/Textured.csproj index 1785b4a..bd178d8 100644 --- a/samples/Textured/Textured.csproj +++ b/samples/Textured/Textured.csproj @@ -1,6 +1,4 @@ - - diff --git a/samples/Textured/main.cs b/samples/Textured/main.cs index 41c3454..3cff23c 100644 --- a/samples/Textured/main.cs +++ b/samples/Textured/main.cs @@ -3,7 +3,7 @@ using System.Numerics; using System.Runtime.InteropServices; using Glfw; using vke; -using VK; +using Vulkan; namespace Textured { class Program : VkWindow { diff --git a/samples/TexturedCube/TexturedCube.csproj b/samples/TexturedCube/TexturedCube.csproj index 8235ef1..a2f41d2 100644 --- a/samples/TexturedCube/TexturedCube.csproj +++ b/samples/TexturedCube/TexturedCube.csproj @@ -1,5 +1,4 @@ - diff --git a/samples/TexturedCube/main.cs b/samples/TexturedCube/main.cs index 88d409e..8a3336a 100644 --- a/samples/TexturedCube/main.cs +++ b/samples/TexturedCube/main.cs @@ -6,7 +6,7 @@ using System.Numerics; using System.Runtime.InteropServices; using Glfw; using vke; -using VK; +using Vulkan; using Buffer = vke.Buffer; namespace TextureCube { diff --git a/samples/Triangle/Triangle.csproj b/samples/Triangle/Triangle.csproj index 25c90c0..3cf0386 100644 --- a/samples/Triangle/Triangle.csproj +++ b/samples/Triangle/Triangle.csproj @@ -1,6 +1,5 @@ - - - + + false diff --git a/samples/Triangle/main.cs b/samples/Triangle/main.cs index cb9918e..9addb88 100644 --- a/samples/Triangle/main.cs +++ b/samples/Triangle/main.cs @@ -4,7 +4,7 @@ using System.Numerics; using System.Runtime.InteropServices; using vke; -using VK; +using Vulkan; namespace Triangle { class Program : VkWindow { diff --git a/samples/common/CrowWin.cs b/samples/common/CrowWin.cs index d7d9f8a..cd440b0 100644 --- a/samples/common/CrowWin.cs +++ b/samples/common/CrowWin.cs @@ -1,6 +1,6 @@ using System; using Glfw; -using VK; +using Vulkan; using System.Threading; namespace Crow { diff --git a/samples/compute/compute.csproj b/samples/compute/compute.csproj index e1734ff..02579c9 100644 --- a/samples/compute/compute.csproj +++ b/samples/compute/compute.csproj @@ -1,5 +1,4 @@ - - + false diff --git a/samples/compute/delaunay.cs b/samples/compute/delaunay.cs index aba1418..8867302 100644 --- a/samples/compute/delaunay.cs +++ b/samples/compute/delaunay.cs @@ -1,6 +1,6 @@ using System; using Glfw; -using VK; +using Vulkan; using vke; namespace delaunay { diff --git a/samples/deferred/DeferredPbrRenderer.cs b/samples/deferred/DeferredPbrRenderer.cs index 540de6a..6e35aed 100644 --- a/samples/deferred/DeferredPbrRenderer.cs +++ b/samples/deferred/DeferredPbrRenderer.cs @@ -3,7 +3,7 @@ using System.Numerics; using System.Runtime.InteropServices; using vke; using vke.glTF; -using VK; +using Vulkan; namespace deferred { public class DeferredPbrRenderer : IDisposable { diff --git a/samples/deferred/EnvironmentPipeline.cs b/samples/deferred/EnvironmentPipeline.cs index 0716c01..1550b6b 100644 --- a/samples/deferred/EnvironmentPipeline.cs +++ b/samples/deferred/EnvironmentPipeline.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Numerics; using System.Runtime.InteropServices; -using VK; +using Vulkan; namespace vke { public class EnvironmentCube : GraphicPipeline { diff --git a/samples/deferred/deferred.csproj b/samples/deferred/deferred.csproj index 89a5f38..d6d3df9 100644 --- a/samples/deferred/deferred.csproj +++ b/samples/deferred/deferred.csproj @@ -1,5 +1,4 @@ - - + false diff --git a/samples/deferred/main-crow.cs b/samples/deferred/main-crow.cs index 2a2301b..20f6566 100644 --- a/samples/deferred/main-crow.cs +++ b/samples/deferred/main-crow.cs @@ -1,7 +1,7 @@ using System; using System.Numerics; using Glfw; -using VK; +using Vulkan; using vke; using System.Collections.Generic; using System.Linq; diff --git a/samples/deferred/main.cs b/samples/deferred/main.cs index 4638661..b12d520 100644 --- a/samples/deferred/main.cs +++ b/samples/deferred/main.cs @@ -4,7 +4,7 @@ using System.Runtime.InteropServices; using vke; using vke.glTF; using Glfw; -using VK; +using Vulkan; namespace deferred { class Deferred : VkWindow { diff --git a/samples/deferred/shadowMapRenderer.cs b/samples/deferred/shadowMapRenderer.cs index 60da378..41bc120 100644 --- a/samples/deferred/shadowMapRenderer.cs +++ b/samples/deferred/shadowMapRenderer.cs @@ -8,7 +8,7 @@ using System.Numerics; using System.Runtime.InteropServices; using vke; using vke.glTF; -using VK; +using Vulkan; using static deferred.DeferredPbrRenderer; namespace deferred { diff --git a/samples/pbr/EnvironmentPipeline.cs b/samples/pbr/EnvironmentPipeline.cs index 06636f7..c4f883c 100644 --- a/samples/pbr/EnvironmentPipeline.cs +++ b/samples/pbr/EnvironmentPipeline.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Numerics; using System.Runtime.InteropServices; -using VK; +using Vulkan; namespace vke { class EnvironmentCube : GraphicPipeline { diff --git a/samples/pbr/PbrModel.cs b/samples/pbr/PbrModel.cs index e4a516d..a598f36 100644 --- a/samples/pbr/PbrModel.cs +++ b/samples/pbr/PbrModel.cs @@ -4,7 +4,7 @@ using System.Numerics; using System.Runtime.InteropServices; -using VK; +using Vulkan; namespace vke { using vke.glTF; diff --git a/samples/pbr/PbrPipeline.cs b/samples/pbr/PbrPipeline.cs index 94abe09..a16c67d 100644 --- a/samples/pbr/PbrPipeline.cs +++ b/samples/pbr/PbrPipeline.cs @@ -5,7 +5,7 @@ using System; using System.Numerics; using System.Runtime.InteropServices; -using VK; +using Vulkan; namespace vke { class PBRPipeline : GraphicPipeline { diff --git a/samples/pbr/main.cs b/samples/pbr/main.cs index 35d9db7..45ee433 100644 --- a/samples/pbr/main.cs +++ b/samples/pbr/main.cs @@ -9,7 +9,7 @@ using System; using System.Numerics; using System.Runtime.InteropServices; using Glfw; -using VK; +using Vulkan; using vke; namespace pbrSample { diff --git a/samples/pbr/pbr.csproj b/samples/pbr/pbr.csproj index c3fa145..c7e287b 100644 --- a/samples/pbr/pbr.csproj +++ b/samples/pbr/pbr.csproj @@ -1,5 +1,4 @@ - false diff --git a/vke/src/ExtensionMethods.cs b/vke/src/ExtensionMethods.cs index 34c1740..df7d5e6 100644 --- a/vke/src/ExtensionMethods.cs +++ b/vke/src/ExtensionMethods.cs @@ -4,10 +4,11 @@ using System; using System.Collections.Generic; using System.Diagnostics; +using System.Linq; using System.Runtime.InteropServices; -using VK; -using static VK.Vk; +using Vulkan; +using static Vulkan.Vk; namespace vke { public static class ExtensionMethods { diff --git a/vke/src/FixedUtf8String.cs b/vke/src/FixedUtf8String.cs index 7b3d7a6..9d11cfd 100644 --- a/vke/src/FixedUtf8String.cs +++ b/vke/src/FixedUtf8String.cs @@ -2,14 +2,14 @@ using System.Runtime.InteropServices; using System.Text; -namespace VK +namespace Vulkan { - public unsafe class FixedUtf8String : IDisposable + public class FixedUtf8String : IDisposable { GCHandle _handle; uint _numBytes; - public byte* StringPtr => (byte*)_handle.AddrOfPinnedObject().ToPointer(); + public IntPtr Ptr => _handle.AddrOfPinnedObject(); public FixedUtf8String(string s) { @@ -38,16 +38,10 @@ namespace VK private string GetString() { - return Encoding.UTF8.GetString(StringPtr, (int)_numBytes); + return Marshal.PtrToStringUni(Ptr); } - - //public void Dispose() - //{ - // _handle.Free(); - //} - - public static implicit operator byte* (FixedUtf8String utf8String) => utf8String.StringPtr; - public static implicit operator IntPtr (FixedUtf8String utf8String) => utf8String._handle.AddrOfPinnedObject (); + + public static implicit operator IntPtr (FixedUtf8String utf8String) => utf8String.Ptr; public static implicit operator FixedUtf8String(string s) => new FixedUtf8String(s); public static implicit operator string(FixedUtf8String utf8String) => utf8String.GetString(); diff --git a/vke/src/MemoryPool.cs b/vke/src/MemoryPool.cs index 6706c49..f3fc11b 100644 --- a/vke/src/MemoryPool.cs +++ b/vke/src/MemoryPool.cs @@ -2,9 +2,9 @@ // // This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) using System; -using VK; +using Vulkan; -using static VK.Vk; +using static Vulkan.Vk; namespace vke { #if MEMORY_POOLS diff --git a/vke/src/ResourceManager.cs b/vke/src/ResourceManager.cs index c01afda..c8b2028 100644 --- a/vke/src/ResourceManager.cs +++ b/vke/src/ResourceManager.cs @@ -1,5 +1,5 @@ using System; -using VK; +using Vulkan; namespace vke { #if MEMORY_POOLS diff --git a/vke/src/ShaderInfo.cs b/vke/src/ShaderInfo.cs index 0762801..d95db2d 100644 --- a/vke/src/ShaderInfo.cs +++ b/vke/src/ShaderInfo.cs @@ -2,7 +2,7 @@ // // This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) using System; -using VK; +using Vulkan; namespace vke { /// diff --git a/vke/src/SpecializationConstant.cs b/vke/src/SpecializationConstant.cs index 91d4356..aca290f 100644 --- a/vke/src/SpecializationConstant.cs +++ b/vke/src/SpecializationConstant.cs @@ -26,7 +26,7 @@ using System; using System.Collections.Generic; using System.Runtime.InteropServices; -using VK; +using Vulkan; namespace vke { /// diff --git a/vke/src/Utils.cs b/vke/src/Utils.cs index 3ac8928..b2a3801 100644 --- a/vke/src/Utils.cs +++ b/vke/src/Utils.cs @@ -4,7 +4,7 @@ using System; using System.Numerics; -namespace VK { +namespace Vulkan { public static partial class Utils { public static string DataDirectory => "../../../datas/"; /// Throw an erro if VkResult != Success. diff --git a/vke/src/VertexAttribute.cs b/vke/src/VertexAttribute.cs index 75bf5df..f1d8e65 100644 --- a/vke/src/VertexAttribute.cs +++ b/vke/src/VertexAttribute.cs @@ -3,7 +3,7 @@ // This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) using System; -namespace VK { +namespace Vulkan { public enum VertexAttributeType { Position, Normal, diff --git a/vke/src/VkFormatSize.cs b/vke/src/VkFormatSize.cs index 75e815d..9f816f4 100644 --- a/vke/src/VkFormatSize.cs +++ b/vke/src/VkFormatSize.cs @@ -3,7 +3,7 @@ // This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) using System; -namespace VK { +namespace Vulkan { [Flags] public enum VkFormatSizeFlag { SizePacked = 0x00000001, diff --git a/vke/src/VkWindow.cs b/vke/src/VkWindow.cs index 1258208..6d8ceb0 100644 --- a/vke/src/VkWindow.cs +++ b/vke/src/VkWindow.cs @@ -6,8 +6,8 @@ using System.Collections.Generic; using System.Diagnostics; using System.Linq; using Glfw; -using VK; -using static VK.Vk; +using Vulkan; +using static Vulkan.Vk; namespace vke { /// diff --git a/vke/src/base/Activable.cs b/vke/src/base/Activable.cs index 28a82ee..13ca491 100644 --- a/vke/src/base/Activable.cs +++ b/vke/src/base/Activable.cs @@ -2,8 +2,8 @@ // // This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) using System; -using VK; -using static VK.Vk; +using Vulkan; +using static Vulkan.Vk; namespace vke { /// diff --git a/vke/src/base/Buffer.cs b/vke/src/base/Buffer.cs index 8af3517..837a9d7 100644 --- a/vke/src/base/Buffer.cs +++ b/vke/src/base/Buffer.cs @@ -2,8 +2,8 @@ // // This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) using System; -using VK; -using static VK.Vk; +using Vulkan; +using static Vulkan.Vk; namespace vke { diff --git a/vke/src/base/CommandBuffer.cs b/vke/src/base/CommandBuffer.cs index 9a22158..220a565 100644 --- a/vke/src/base/CommandBuffer.cs +++ b/vke/src/base/CommandBuffer.cs @@ -4,9 +4,9 @@ using System; using System.Runtime.InteropServices; -using VK; +using Vulkan; -using static VK.Vk; +using static Vulkan.Vk; namespace vke { /// diff --git a/vke/src/base/CommandPool.cs b/vke/src/base/CommandPool.cs index 6be3e0a..d31605a 100644 --- a/vke/src/base/CommandPool.cs +++ b/vke/src/base/CommandPool.cs @@ -4,8 +4,8 @@ using System; using System.Runtime.InteropServices; -using VK; -using static VK.Vk; +using Vulkan; +using static Vulkan.Vk; namespace vke { /// diff --git a/vke/src/base/ComputePipeline.cs b/vke/src/base/ComputePipeline.cs index c8d9f13..3aeca89 100644 --- a/vke/src/base/ComputePipeline.cs +++ b/vke/src/base/ComputePipeline.cs @@ -24,8 +24,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. using System; -using VK; -using static VK.Vk; +using Vulkan; +using static Vulkan.Vk; namespace vke { public sealed class ComputePipeline : Pipeline { diff --git a/vke/src/base/DebuDrawPipeline.cs b/vke/src/base/DebuDrawPipeline.cs index 43aae95..60eda5b 100644 --- a/vke/src/base/DebuDrawPipeline.cs +++ b/vke/src/base/DebuDrawPipeline.cs @@ -1,7 +1,7 @@ using System; using System.Numerics; using System.Runtime.InteropServices; -using VK; +using Vulkan; namespace vke { public class DebugDrawPipeline : GraphicPipeline { diff --git a/vke/src/base/DebugReport.cs b/vke/src/base/DebugReport.cs index d1ce888..1e1842b 100644 --- a/vke/src/base/DebugReport.cs +++ b/vke/src/base/DebugReport.cs @@ -25,8 +25,8 @@ // THE SOFTWARE. using System; using System.Runtime.InteropServices; -using VK; -using static VK.Vk; +using Vulkan; +using static Vulkan.Vk; namespace vke { diff --git a/vke/src/base/DebugUtilsMessenger.cs b/vke/src/base/DebugUtilsMessenger.cs index 58c8187..9a83392 100644 --- a/vke/src/base/DebugUtilsMessenger.cs +++ b/vke/src/base/DebugUtilsMessenger.cs @@ -1,7 +1,7 @@ using System; using System.Runtime.InteropServices; -using VK; -using static VK.Vk; +using Vulkan; +using static Vulkan.Vk; namespace vke.DebugUtils { diff --git a/vke/src/base/DescriptorPool.cs b/vke/src/base/DescriptorPool.cs index 7f0cde2..ad8dba7 100644 --- a/vke/src/base/DescriptorPool.cs +++ b/vke/src/base/DescriptorPool.cs @@ -4,8 +4,8 @@ using System; using System.Collections.Generic; -using VK; -using static VK.Vk; +using Vulkan; +using static Vulkan.Vk; namespace vke { public sealed class DescriptorPool : Activable { diff --git a/vke/src/base/DescriptorSet.cs b/vke/src/base/DescriptorSet.cs index 3048228..80c583d 100644 --- a/vke/src/base/DescriptorSet.cs +++ b/vke/src/base/DescriptorSet.cs @@ -2,7 +2,7 @@ // // This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) using System.Collections.Generic; -using VK; +using Vulkan; namespace vke { public class DescriptorSet { diff --git a/vke/src/base/DescriptorSetLayout.cs b/vke/src/base/DescriptorSetLayout.cs index 1113adc..6df04fb 100644 --- a/vke/src/base/DescriptorSetLayout.cs +++ b/vke/src/base/DescriptorSetLayout.cs @@ -3,8 +3,8 @@ // This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT) using System; using System.Collections.Generic; -using VK; -using static VK.Vk; +using Vulkan; +using static Vulkan.Vk; namespace vke { /// diff --git a/vke/src/base/DescriptorSetWrites.cs b/vke/src/base/DescriptorSetWrites.cs index cbacae6..51f8c0a 100644 --- a/vke/src/base/DescriptorSetWrites.cs +++ b/vke/src/base/DescriptorSetWrites.cs @@ -26,8 +26,8 @@ using System; using System.Collections.Generic; using System.Runtime.InteropServices; -using VK; -using static VK.Vk; +using Vulkan; +using static Vulkan.Vk; namespace vke { /// diff --git a/vke/src/base/Device.cs b/vke/src/base/Device.cs index fcb8734..8f61fe9 100644 --- a/vke/src/base/Device.cs +++ b/vke/src/base/Device.cs @@ -29,8 +29,8 @@ using System.Collections.Generic; using System.IO; using System.Linq; using System.Reflection; -using VK; -using static VK.Vk; +using Vulkan; +using static Vulkan.Vk; namespace vke { diff --git a/vke/src/base/FrameBuffer.cs b/vke/src/base/FrameBuffer.cs index 2b73e7f..3260e15 100644 --- a/vke/src/base/FrameBuffer.cs +++ b/vke/src/base/FrameBuffer.cs @@ -26,9 +26,9 @@ using System; using System.Collections.Generic; using System.Linq; -using VK; +using Vulkan; -using static VK.Vk; +using static Vulkan.Vk; namespace vke { diff --git a/vke/src/base/GPUBuffer.cs b/vke/src/base/GPUBuffer.cs index b670812..bebc21b 100644 --- a/vke/src/base/GPUBuffer.cs +++ b/vke/src/base/GPUBuffer.cs @@ -25,7 +25,7 @@ // THE SOFTWARE. using System; using System.Runtime.InteropServices; -using VK; +using Vulkan; namespace vke { diff --git a/vke/src/base/GraphicPipeline.cs b/vke/src/base/GraphicPipeline.cs index 5d16b2c..7f94316 100644 --- a/vke/src/base/GraphicPipeline.cs +++ b/vke/src/base/GraphicPipeline.cs @@ -25,8 +25,8 @@ // THE SOFTWARE. using System; using System.Collections.Generic; -using VK; -using static VK.Vk; +using Vulkan; +using static Vulkan.Vk; namespace vke { public class GraphicPipeline : Pipeline { diff --git a/vke/src/base/GraphicPipelineConfig.cs b/vke/src/base/GraphicPipelineConfig.cs index 697e623..848a378 100644 --- a/vke/src/base/GraphicPipelineConfig.cs +++ b/vke/src/base/GraphicPipelineConfig.cs @@ -28,8 +28,8 @@ using System.Collections.Generic; using System.Numerics; using System.Reflection; using System.Runtime.InteropServices; -using VK; -using static VK.Vk; +using Vulkan; +using static Vulkan.Vk; namespace vke { public class GraphicPipelineConfig { diff --git a/vke/src/base/HostBuffer.cs b/vke/src/base/HostBuffer.cs index 9465614..65dc53e 100644 --- a/vke/src/base/HostBuffer.cs +++ b/vke/src/base/HostBuffer.cs @@ -26,8 +26,8 @@ using System; using System.Collections.Generic; using System.Runtime.InteropServices; -using VK; -using static VK.Vk; +using Vulkan; +using static Vulkan.Vk; namespace vke { diff --git a/vke/src/base/Image.cs b/vke/src/base/Image.cs index 96ab24a..7b6d000 100644 --- a/vke/src/base/Image.cs +++ b/vke/src/base/Image.cs @@ -25,9 +25,9 @@ // THE SOFTWARE. using System; using System.Diagnostics; -using VK; +using Vulkan; -using static VK.Vk; +using static Vulkan.Vk; namespace vke { /// diff --git a/vke/src/base/Instance.cs b/vke/src/base/Instance.cs index 2807ed2..86e303b 100644 --- a/vke/src/base/Instance.cs +++ b/vke/src/base/Instance.cs @@ -26,8 +26,8 @@ using System; using System.Collections.Generic; using System.Runtime.InteropServices; -using VK; -using static VK.Vk; +using Vulkan; +using static Vulkan.Vk; namespace vke { /// diff --git a/vke/src/base/PhysicalDevice.cs b/vke/src/base/PhysicalDevice.cs index 289a629..82e2582 100644 --- a/vke/src/base/PhysicalDevice.cs +++ b/vke/src/base/PhysicalDevice.cs @@ -24,13 +24,15 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. using System; -using VK; -using static VK.Vk; -using static VK.Utils; +using Vulkan; +using static Vulkan.Vk; +using static Vulkan.Utils; using System.Collections; using System.Collections.Generic; using System.Runtime.InteropServices; +using System.Linq; + namespace vke { public class PhysicalDeviceCollection : IEnumerable { VkInstance inst; diff --git a/vke/src/base/Pipeline.cs b/vke/src/base/Pipeline.cs index bb67cbc..19c62de 100644 --- a/vke/src/base/Pipeline.cs +++ b/vke/src/base/Pipeline.cs @@ -24,8 +24,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. using System; -using VK; -using static VK.Vk; +using Vulkan; +using static Vulkan.Vk; namespace vke { public abstract class Pipeline : Activable { diff --git a/vke/src/base/PipelineCache.cs b/vke/src/base/PipelineCache.cs index 40fae4e..0129cac 100644 --- a/vke/src/base/PipelineCache.cs +++ b/vke/src/base/PipelineCache.cs @@ -28,9 +28,9 @@ using System.Collections.Generic; using System.IO; using System.Reflection; using System.Runtime.InteropServices; -using VK; +using Vulkan; -using static VK.Vk; +using static Vulkan.Vk; namespace vke { /// diff --git a/vke/src/base/PipelineLayout.cs b/vke/src/base/PipelineLayout.cs index f864a1b..ba5c257 100644 --- a/vke/src/base/PipelineLayout.cs +++ b/vke/src/base/PipelineLayout.cs @@ -26,8 +26,8 @@ using System; using System.Collections.Generic; using System.Linq; -using VK; -using static VK.Vk; +using Vulkan; +using static Vulkan.Vk; namespace vke { public sealed class PipelineLayout : Activable { diff --git a/vke/src/base/QueryPool.cs b/vke/src/base/QueryPool.cs index 256e780..6dfad44 100644 --- a/vke/src/base/QueryPool.cs +++ b/vke/src/base/QueryPool.cs @@ -25,8 +25,8 @@ // THE SOFTWARE. using System; using System.Collections.Generic; -using VK; -using static VK.Vk; +using Vulkan; +using static Vulkan.Vk; namespace vke { public class TimestampQueryPool : QueryPool { diff --git a/vke/src/base/Queue.cs b/vke/src/base/Queue.cs index a3a3fd2..1dddfa0 100644 --- a/vke/src/base/Queue.cs +++ b/vke/src/base/Queue.cs @@ -25,9 +25,9 @@ // THE SOFTWARE. using System; using System.Collections; -using VK; +using Vulkan; -using static VK.Vk; +using static Vulkan.Vk; namespace vke { diff --git a/vke/src/base/RenderPass.cs b/vke/src/base/RenderPass.cs index 48c3278..f93ddcd 100644 --- a/vke/src/base/RenderPass.cs +++ b/vke/src/base/RenderPass.cs @@ -26,9 +26,9 @@ using System; using System.Collections.Generic; using System.Linq; -using VK; +using Vulkan; -using static VK.Vk; +using static Vulkan.Vk; namespace vke { public class RenderPass : Activable { diff --git a/vke/src/base/Resource.cs b/vke/src/base/Resource.cs index 89552ee..1b559ed 100644 --- a/vke/src/base/Resource.cs +++ b/vke/src/base/Resource.cs @@ -2,9 +2,9 @@ using System.Diagnostics; using System.IO; using System.Runtime.InteropServices; -using VK; +using Vulkan; -using static VK.Vk; +using static Vulkan.Vk; namespace vke { [DebuggerDisplay ("{previous.name} <- {name} -> {next.name}")] diff --git a/vke/src/base/SubPass.cs b/vke/src/base/SubPass.cs index 4a490e0..ca91424 100644 --- a/vke/src/base/SubPass.cs +++ b/vke/src/base/SubPass.cs @@ -24,7 +24,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. using System.Collections.Generic; -using VK; +using Vulkan; namespace vke { public class SubPass { diff --git a/vke/src/base/SwapChain.cs b/vke/src/base/SwapChain.cs index 9c2bea7..d49dd54 100644 --- a/vke/src/base/SwapChain.cs +++ b/vke/src/base/SwapChain.cs @@ -24,8 +24,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN // THE SOFTWARE. using System; -using VK; -using static VK.Vk; +using Vulkan; +using static Vulkan.Vk; namespace vke { public class SwapChain : Activable { diff --git a/vke/src/gl.cs b/vke/src/gl.cs index 89de221..42dd70e 100644 --- a/vke/src/gl.cs +++ b/vke/src/gl.cs @@ -50,7 +50,7 @@ // See the License for the specific language governing permissions and // limitations under the License. using System.Diagnostics; -using VK; +using Vulkan; namespace KTX { diff --git a/vke/src/ktx.cs b/vke/src/ktx.cs index 2d6271c..ce6948f 100644 --- a/vke/src/ktx.cs +++ b/vke/src/ktx.cs @@ -4,7 +4,7 @@ using System; using System.IO; -using VK; +using Vulkan; using vke; using System.Runtime.InteropServices; using System.Collections.Generic; diff --git a/vke/src/model/Model.cs b/vke/src/model/Model.cs index 6b7d0f1..52fbbe9 100644 --- a/vke/src/model/Model.cs +++ b/vke/src/model/Model.cs @@ -26,7 +26,7 @@ using System; using System.Collections.Generic; using System.Numerics; -using VK; +using Vulkan; namespace vke { diff --git a/vke/vke.csproj b/vke/vke.csproj index d4b6563..ca13eff 100644 --- a/vke/vke.csproj +++ b/vke/vke.csproj @@ -1,14 +1,14 @@ - net471;netstandard2.0 + netstandard2.0 - 0.1.7 + 0.1.8 $(ReleaseVersion) C# vulkan library with IDispose model and references counting https://github.com/jpbruyere/vke.net vulkan game engine compute glfw c# - $(AssemblyVersion) + $(AssemblyVersion)-beta True False https://github.com/jpbruyere/vke.net/blob/master/README.md @@ -46,8 +46,8 @@ - - + + -- 2.47.3