rename namespace to Vulkan

25 files changed, 69 insertions, 44 deletions

diff --git a/Directory.Build.props b/Directory.Build.props
index 0ec3f0f..f93ff3e 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,15 +1,15 @@
 <Project>
-    <PropertyGroup>
-        <RootDirectory>$(MSBuildThisFileDirectory)</RootDirectory>
-        <Deterministic>true</Deterministic>
-        
-        <TargetFrameworks>net471;netstandard2.0</TargetFrameworks>
-        
+	<PropertyGroup>
+		<RootDirectory>$(MSBuildThisFileDirectory)</RootDirectory>
+		<Deterministic>true</Deterministic>
+
+		<!--<TargetFrameworks>net471;netcoreapp2.2</TargetFrameworks>-->
+
 		<RepositoryUrl>https://github.com/jpbruyere/vk.net</RepositoryUrl>
 		<License>MIT</License>
-	    <Authors>Jean-Philippe Bruyère</Authors>
-	    
-	    <LangVersion>7.2</LangVersion>
-	    
-    </PropertyGroup>
+		<Authors>Jean-Philippe Bruyère</Authors>
+
+		<LangVersion>7.2</LangVersion>
+
+	</PropertyGroup>
 </Project>
diff --git a/VK/BindingsHelpers.cs b/VK/BindingsHelpers.cs
index 3b1ce6e..60a4ae2 100644
--- a/VK/BindingsHelpers.cs
+++ b/VK/BindingsHelpers.cs
@@ -7,7 +7,7 @@ using System.Diagnostics;
 using System.Runtime.InteropServices;
 using System.Text;
 
-namespace VK {
+namespace Vulkan {
 	public static class BindingsHelpers
     {
         public static unsafe StringHandle StringToHGlobalUtf8(string s)
diff --git a/VK/CalliRewriteAttribute.cs b/VK/CalliRewriteAttribute.cs
index 29f7b35..c30a22c 100644
--- a/VK/CalliRewriteAttribute.cs
+++ b/VK/CalliRewriteAttribute.cs
@@ -4,7 +4,7 @@
 // This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT)
 using System;
 
-namespace VK.Generator
+namespace Vulkan.Generator
 {
     public class CalliRewriteAttribute : Attribute
     {
diff --git a/VK/Commands.cs b/VK/Commands.cs
index 1b81e34..e25eee0 100644
--- a/VK/Commands.cs
+++ b/VK/Commands.cs
@@ -7,7 +7,7 @@ using System.Diagnostics;
 using System.IO;
 using System.Runtime.InteropServices;
 
-namespace VK
+namespace Vulkan
 {
     public static partial class Vk
     {
diff --git a/VK/Delegates.cs b/VK/Delegates.cs
index 8feef9f..f400aca 100644
--- a/VK/Delegates.cs
+++ b/VK/Delegates.cs
@@ -4,7 +4,7 @@
 // This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT)
 using System;
 
-namespace VK
+namespace Vulkan
 {
     public unsafe delegate void* PFN_vkAllocationFunction(
          void* pUserData,
diff --git a/VK/ExternalTypes.cs b/VK/ExternalTypes.cs
index fe2b643..dfde870 100644
--- a/VK/ExternalTypes.cs
+++ b/VK/ExternalTypes.cs
@@ -4,7 +4,7 @@
 // This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT)
 using System;
 
-namespace VK
+namespace Vulkan
 {
     // Windows
 
diff --git a/VK/Kernel32.cs b/VK/Kernel32.cs
index 327b14b..7154319 100644
--- a/VK/Kernel32.cs
+++ b/VK/Kernel32.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace VK
+namespace Vulkan
 {
     internal static class Kernel32
     {
diff --git a/VK/Libdl.cs b/VK/Libdl.cs
index c268dfa..ffd278b 100644
--- a/VK/Libdl.cs
+++ b/VK/Libdl.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace VK
+namespace Vulkan
 {
     internal static class Libdl
     {
diff --git a/VK/Structs.cs b/VK/Structs.cs
index 4d4594a..bab15c5 100644
--- a/VK/Structs.cs
+++ b/VK/Structs.cs
@@ -5,7 +5,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace VK {
+namespace Vulkan {
 	[StructLayout (LayoutKind.Explicit)]
 	public struct VkClearValue {
 		[FieldOffset (0)]
diff --git a/VK/Utils.cs b/VK/Utils.cs
index b7a860f..cd2b3ee 100644
--- a/VK/Utils.cs
+++ b/VK/Utils.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace VK {
+namespace Vulkan {
 	internal static class LoadingUtils {
 		public static IntPtr GetDelegate (VkInstance inst, string name) {
 			byte[] n = System.Text.Encoding.UTF8.GetBytes (name + '\0');
diff --git a/VK/Version.cs b/VK/Version.cs
new file mode 100644
index 0000000..ed71d20
--- /dev/null
+++ b/VK/Version.cs
@@ -0,0 +1,23 @@
+namespace Vulkan 
+{
+    public struct Version
+    {
+        private readonly uint value;
+
+        public Version(uint major, uint minor, uint patch)
+        {
+            value = major << 22 | minor << 12 | patch;
+        }
+
+        public uint Major => value >> 22;
+
+        public uint Minor => (value >> 12) & 0x3ff;
+
+        public uint Patch => (value >> 22) & 0xfff;
+
+        public static implicit operator uint(Version version)
+        {
+            return version.value;
+        }
+    }
+}
\ No newline at end of file
diff --git a/VK/VkBool32.cs b/VK/VkBool32.cs
index 867d591..814e20d 100644
--- a/VK/VkBool32.cs
+++ b/VK/VkBool32.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
 {
     /// <summary>
     /// A boolean value stored in a 4-byte unsigned integer.
diff --git a/VK/VkExtent2D.cs b/VK/VkExtent2D.cs
index 044b886..3a32769 100644
--- a/VK/VkExtent2D.cs
+++ b/VK/VkExtent2D.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 {
 	/// <summary>
 	/// Structure specifying a two-dimensional extent.
 	/// </summary>
diff --git a/VK/VkOffset2D.cs b/VK/VkOffset2D.cs
index 321b82e..3e762a0 100644
--- a/VK/VkOffset2D.cs
+++ b/VK/VkOffset2D.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 {
 	/// <summary>
 	/// Structure specifying a two-dimensional offset.
 	/// </summary>
diff --git a/VK/VkRect2D.cs b/VK/VkRect2D.cs
index 6480ca4..5e332c4 100644
--- a/VK/VkRect2D.cs
+++ b/VK/VkRect2D.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Text;
 
-namespace VK
+namespace Vulkan
 {
     /// <summary>
     /// Structure specifying a two-dimensional subregion.
diff --git a/vk.net-128.png b/VK/vk.net-128.png
index 781ac00..781ac00 100644
--- a/vk.net-128.png
+++ b/VK/vk.net-128.png
diff --git a/VK/vk.net-64.png b/VK/vk.net-64.png
new file mode 100644
index 0000000..97922b0
--- /dev/null
+++ b/VK/vk.net-64.png
diff --git a/VK/vulkan.csproj b/VK/vulkan.csproj
index d385b61..86bf9c1 100644
--- a/VK/vulkan.csproj
+++ b/VK/vulkan.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>   
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <Copyright></Copyright>
-    <AssemblyVersion>0.1.5</AssemblyVersion>
+    <AssemblyVersion>0.1.6</AssemblyVersion>
     <AssemblyName>VK</AssemblyName>
     <Description>C# vulkan binding</Description>
     <Company></Company>
@@ -12,7 +13,7 @@
     <PackageVersion>$(AssemblyVersion)-beta</PackageVersion>        
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageProjectUrl>https://github.com/jpbruyere/vk.net/blob/master/README.md</PackageProjectUrl>
-    <PackageIconUrl>https://github.com/jpbruyere/vk.net/blob/master/vk.net-128.png</PackageIconUrl>
+    <PackageIcon>vk.net-64.png</PackageIcon>
     <SynchReleaseVersion>false</SynchReleaseVersion>
     <OutputPath>$(SolutionDir)build\$(Configuration)\</OutputPath>
   </PropertyGroup>
@@ -24,6 +25,11 @@
     <ProjectReference Include="..\vk.generator\vk.generator.csproj" PrivateAssets="All" />
     <ProjectReference Include="..\vk.rewrite\vk.rewrite.csproj" PrivateAssets="All" />
   </ItemGroup>
+  <ItemGroup>
+    <None Update="vk.net-64.png">
+      <IncludeInPackage>true</IncludeInPackage>
+    </None>
+  </ItemGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DefineConstants>TRACE;NETSTANDARD;NETSTANDARD2_0;DEBUG;NETFRAMEWORK;NET471</DefineConstants>    
diff --git a/vk.generator/Program.cs b/vk.generator/Program.cs
index 4e722ef..896d918 100644
--- a/vk.generator/Program.cs
+++ b/vk.generator/Program.cs
@@ -82,7 +82,7 @@ namespace vk.generator {
 		const int extBase = 1000000000;
 		const int extBlockSize = 1000;
 
-		public const string vknamespace = "VK";
+		public const string vknamespace = "Vulkan";
 		public const string vkCommonCmdClassName = "Vk";
 		public const string heading = "/* autogenerated with http://github.com/jpbruyere/vk.net */";
 		public static string[] defaultUsings = { "System" };
diff --git a/vk.generator/vk.generator.csproj b/vk.generator/vk.generator.csproj
index efa8340..08d6214 100644
--- a/vk.generator/vk.generator.csproj
+++ b/vk.generator/vk.generator.csproj
@@ -1,9 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>    
+    <TargetFrameworks>net471;netstandard2.0</TargetFrameworks>
     <OutputType>Exe</OutputType>        
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
-            
+    
   <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))"> 
     <Reference Include="System" />
   </ItemGroup>          
diff --git a/vk.net-32.png b/vk.net-32.png
deleted file mode 100644
index 81f33ed..0000000
--- a/vk.net-32.png
+++ /dev/null
diff --git a/vk.net.sln b/vk.net.sln
index 1bbc545..cc7f879 100644
--- a/vk.net.sln
+++ b/vk.net.sln
@@ -34,28 +34,16 @@ Global
 		Policies = $0
 		$0.TextStylePolicy = $1
 		$1.FileWidth = 80
-		$1.NoTabsAfterNonTabs = True
-		$1.EolMarker = Unix
 		$1.scope = text/x-csharp
+		$1.TabsToSpaces = True
 		$0.CSharpFormattingPolicy = $2
-		$2.LabelPositioning = LeftMost
-		$2.NewLinesForBracesInTypes = False
-		$2.NewLinesForBracesInMethods = False
-		$2.NewLinesForBracesInProperties = False
-		$2.NewLinesForBracesInAccessors = False
-		$2.NewLinesForBracesInControlBlocks = False
-		$2.NewLinesForBracesInObjectCollectionArrayInitializers = False
-		$2.NewLineForElse = False
-		$2.NewLineForCatch = False
-		$2.NewLineForFinally = False
-		$2.SpacingAfterMethodDeclarationName = True
-		$2.SpaceAfterMethodCallName = True
 		$2.scope = text/x-csharp
 		$0.DotNetNamingPolicy = $3
 		$3.DirectoryNamespaceAssociation = PrefixedHierarchical
 		$0.TextStylePolicy = $4
 		$4.FileWidth = 80
 		$4.scope = text/plain
+		$4.TabsToSpaces = True
 		$0.TextStylePolicy = $5
 		$5.inheritsSet = null
 		$5.scope = application/config+xml
@@ -70,5 +58,11 @@ Global
 		$0.XmlFormattingPolicy = $9
 		$9.inheritsSet = null
 		$9.scope = application/x-msbuild
+		$0.TextStylePolicy = $10
+		$10.FileWidth = 80
+		$10.TabsToSpaces = True
+		$10.scope = application/xml
+		$0.XmlFormattingPolicy = $11
+		$11.scope = application/xml
 	EndGlobalSection
 EndGlobal
diff --git a/vk.rewrite/Program.cs b/vk.rewrite/Program.cs
index 3f238ea..db41bab 100644
--- a/vk.rewrite/Program.cs
+++ b/vk.rewrite/Program.cs
@@ -15,7 +15,7 @@ namespace Vk.Rewrite
 {
     public class Program
     {
-		const string mainVkNamespace = "VK";
+		const string mainVkNamespace = "Vulkan";
 
         static TypeReference s_calliRewriteRef;
         static MethodReference s_stringToHGlobalUtf8Ref;
diff --git a/vk.rewrite/vk.rewrite.csproj b/vk.rewrite/vk.rewrite.csproj
index e668f32..2c43d1b 100644
--- a/vk.rewrite/vk.rewrite.csproj
+++ b/vk.rewrite/vk.rewrite.csproj
@@ -1,9 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <TargetFrameworks>net471;netstandard2.0</TargetFrameworks>
     <OutputType>Exe</OutputType>        
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
-            
+              
   <ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
     <Reference Include="System" />
   </ItemGroup>        
diff --git a/vknet.png b/vknet.png
deleted file mode 100644
index 714f488..0000000
--- a/vknet.png
+++ /dev/null