update to net 6

9 files changed, 54 insertions, 34 deletions

diff --git a/.vscode/launch.json b/.vscode/launch.json
index 9c772af..d9f170b 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -9,7 +9,7 @@
 			"type": "coreclr",
 			"request": "launch",
 			"preLaunchTask": "build generator",
-			"program": "${workspaceFolder}/vk.generator/bin/Debug/netcoreapp3.1/vk.generator",
+			"program": "${workspaceFolder}/vk.generator/bin/Debug/net6/vk.generator",
 			"args": ["Vulkan-Docs/xml/vk.xml"],
 			"cwd": "${workspaceFolder}",
 			"console": "externalTerminal",
@@ -20,7 +20,7 @@
 			"type": "coreclr",
 			"request": "launch",
 			"preLaunchTask": "build rewrite",
-			"program": "${workspaceFolder}/vk.rewrite/bin/Debug/netcoreapp3.1/vk.rewrite",
+			"program": "${workspaceFolder}/vk.rewrite/bin/Debug/net6/vk.rewrite",
 			"args": ["vulkan/bin/Debug/netstandard2.1/Vulkan.dll"],
 			"cwd": "${workspaceFolder}",
 			"console": "internalConsole",
@@ -31,7 +31,7 @@
 			"type": "coreclr",
 			"request": "launch",
 			"preLaunchTask": "build create_instance",
-			"program": "${workspaceFolder}/build/Debug/netcoreapp3.1/create_instance",
+			"program": "${workspaceFolder}/build/Debug/net6/create_instance",
 			"args": [],
 			"cwd": "${workspaceFolder}",
 			"console": "externalTerminal",
@@ -42,22 +42,23 @@
 			"type": "coreclr",
 			"request": "launch",
 			"preLaunchTask": "build select_physical_dev",
-			"program": "${workspaceFolder}/build/Debug/netcoreapp3.1/select_physical_dev",
+			"program": "${workspaceFolder}/build/Debug/net6/select_physical_dev",
 			"args": [],
 			"cwd": "${workspaceFolder}",
 			"console": "externalTerminal",
-			"stopAtEntry": false
+			"stopAtEntry": false,
 		},
 		{
 			"name": ".NET Core Launch (create_device)",
 			"type": "coreclr",
 			"request": "launch",
 			"preLaunchTask": "build create_device",
-			"program": "${workspaceFolder}/build/Debug/netcoreapp3.1/create_device",
+			"program": "${workspaceFolder}/build/Debug/net6/create_device",
 			"args": [],
 			"cwd": "${workspaceFolder}",
 			"console": "externalTerminal",
-			"stopAtEntry": false
+			"stopAtEntry": false,
+			"justMyCode": false,
 		},
 		{
 			"name": ".NET Core Attach",
diff --git a/Directory.Build.props b/Directory.Build.props
index 895236f..afe6a5a 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -9,7 +9,7 @@
 		<Copyright></Copyright>
 		<Company></Company>
 
-		<ToolsFramework>netcoreapp3.1</ToolsFramework>
+		<ToolsFramework>net6</ToolsFramework>
 
 		<!--regenerate vk.net sources with vk.generator-->
 		<Regenerate>true</Regenerate>
diff --git a/samples/create_device/Program.cs b/samples/create_device/Program.cs
index b2c0f5a..1a8796f 100644
--- a/samples/create_device/Program.cs
+++ b/samples/create_device/Program.cs
@@ -1,9 +1,11 @@
-using System;
+// Copyright (c) 2024  Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
+//
+// This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT)
+using System;
 using Vulkan;
 using static Vulkan.Vk;
 using static Vulkan.Utils;
 using System.Linq;
-using System.Runtime.InteropServices;
 
 namespace tests
 {	
@@ -13,22 +15,32 @@ namespace tests
 		{
 			VkInstance inst;
 
+			vkEnumerateInstanceLayerProperties(out uint lpc, IntPtr.Zero);
+			VkLayerProperties[] lp = new VkLayerProperties[lpc];
+			vkEnumerateInstanceLayerProperties(out lpc, lp.Pin());
+			lp.Unpin();
+
+			foreach (VkLayerProperties lpi in lp)
+			{
+				Console.WriteLine($"Layer: {lpi.layerName}");
+				Console.WriteLine($"       {lpi.description}");
+			}
+
 			using (VkApplicationInfo ai = new VkApplicationInfo (
 				new Vulkan.Version(1,2,0),
 				new Vulkan.Version(1,2,0),
 				new Vulkan.Version(1,3,0)
-			)) {
-				
-			using (PinnedObjects po = new PinnedObjects()) {
-				IntPtr[] instanceExts = {Ext.I.VK_KHR_get_physical_device_properties2.Pin(po)};
-				IntPtr[] layers = {"VK_LAYER_KHRONOS_validation".Pin(po)};
-				using (VkInstanceCreateInfo ci = new VkInstanceCreateInfo {
-					pApplicationInfo = ai,
-					enabledExtensionCount = 1,
-					enabledLayerCount = 1,
-					ppEnabledExtensionNames = instanceExts.Pin(po),
-					ppEnabledLayerNames = layers.Pin(po)}){
-						CheckResult (vkCreateInstance (ci, IntPtr.Zero, out inst));
+			)) {	
+				using (PinnedObjects po = new PinnedObjects()) {
+					IntPtr[] instanceExts = {Ext.I.VK_KHR_get_physical_device_properties2.Pin(po)};
+					IntPtr[] layers = {"VK_LAYER_KHRONOS_validation".Pin(po)};
+					using (VkInstanceCreateInfo ci = new VkInstanceCreateInfo {
+						pApplicationInfo = ai,
+						enabledExtensionCount = 1,
+						enabledLayerCount = 1,
+						ppEnabledExtensionNames = instanceExts.Pin(po),
+						ppEnabledLayerNames = layers.Pin(po)}){
+							CheckResult (vkCreateInstance (ci, IntPtr.Zero, out inst));
 					}
 				}
 			}
@@ -79,6 +91,8 @@ namespace tests
 					CheckResult (vkCreateDevice (phy, deviceCreateInfo, IntPtr.Zero, out dev));
 				}
 			}
+
+			Vk.LoadDeviceFunctionPointers(dev);
 			
 			vkGetDeviceQueue (dev, qFamIndex, 0, out VkQueue gQ);
 
diff --git a/samples/create_device/create_device.csproj b/samples/create_device/create_device.csproj
index c73e0d1..6de3298 100644
--- a/samples/create_device/create_device.csproj
+++ b/samples/create_device/create_device.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/samples/create_instance/Program.cs b/samples/create_instance/Program.cs
index 234afc3..b2706ee 100644
--- a/samples/create_instance/Program.cs
+++ b/samples/create_instance/Program.cs
@@ -1,4 +1,7 @@
-using System;
+// Copyright (c) 2024  Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
+//
+// This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT)
+using System;
 using Vulkan;
 using static Vulkan.Vk;
 
@@ -10,9 +13,10 @@ namespace tests
 		static void Main(string[] args)
 		{
 			VkInstance instance;
+			Vulkan.Version v = new Vulkan.Version(1,0,0);
 #if AUTO_SET_STYPE
 			Console.WriteLine ("AUTO_SET_STYPE: ON");
-			using (VkApplicationInfo ai = new VkApplicationInfo()) {
+			using (VkApplicationInfo ai = new VkApplicationInfo(v, v, v)) {
 				using (VkInstanceCreateInfo ci = new VkInstanceCreateInfo {pApplicationInfo = ai}){
 					Console.WriteLine (vkCreateInstance (ci, IntPtr.Zero, out instance));
 				}
diff --git a/samples/create_instance/create_instance.csproj b/samples/create_instance/create_instance.csproj
index c73e0d1..6de3298 100644
--- a/samples/create_instance/create_instance.csproj
+++ b/samples/create_instance/create_instance.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/samples/select_physical_dev/Program.cs b/samples/select_physical_dev/Program.cs
index 59ab23e..91d2d0c 100644
--- a/samples/select_physical_dev/Program.cs
+++ b/samples/select_physical_dev/Program.cs
@@ -1,4 +1,7 @@
-using System;
+// Copyright (c) 2024  Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
+//
+// This code is licensed under the MIT license (MIT) (http://opensource.org/licenses/MIT)
+using System;
 using Vulkan;
 using static Vulkan.Vk;
 using static Vulkan.Utils;
@@ -8,8 +11,6 @@ namespace tests
 {
 	class Program
 	{
-		delegate void del(IntPtr phy, ref VkPhysicalDeviceFeatures2 vdf);
-		delegate void del2(IntPtr phy, IntPtr vdf);
 		static void Main(string[] args)
 		{
 			VkInstance inst;
@@ -30,6 +31,7 @@ namespace tests
 			VkPhysicalDevice[] phys = new VkPhysicalDevice[phyCount];
 
 			CheckResult (vkEnumeratePhysicalDevices (inst, out phyCount, phys.Pin()));
+			phys.Unpin();
 
 			for (int i = 0; i < phys.Length; i++)
 			{
diff --git a/samples/select_physical_dev/select_physical_dev.csproj b/samples/select_physical_dev/select_physical_dev.csproj
index c73e0d1..6de3298 100644
--- a/samples/select_physical_dev/select_physical_dev.csproj
+++ b/samples/select_physical_dev/select_physical_dev.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6</TargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/vulkan/vulkan.csproj b/vulkan/vulkan.csproj
index 68d2349..935ae6b 100644
--- a/vulkan/vulkan.csproj
+++ b/vulkan/vulkan.csproj
@@ -3,7 +3,7 @@
 	<PropertyGroup>
 		<TargetFrameworks>netstandard2.1</TargetFrameworks>
 
-		<AssemblyVersion>0.5.3</AssemblyVersion>
+		<AssemblyVersion>0.6.0</AssemblyVersion>
 		<AssemblyName>Vulkan</AssemblyName>
 		<PackageVersion>$(AssemblyVersion)</PackageVersion>
 
@@ -19,14 +19,13 @@
 		<PackageIcon>vk.net-64.png</PackageIcon>
 		<SynchReleaseVersion>false</SynchReleaseVersion>
 		<PackageReleaseNotes>
-		 - vkapi global variable to select vulkan/vulkansc
+		 - update dotnet 6 for samples and generator.
 		 - update vulkan xml to v1.3.269
-		 - AUTO_SET_STYPE = on
 		</PackageReleaseNotes>
 		<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 
-		<NoWarn>$(NoWarn);1591;0419</NoWarn>
+		<NoWarn>$(NoWarn);1574;1591;0419</NoWarn>
 	</PropertyGroup>
 
 	<PropertyGroup Condition=" '$(AutoSetSType)' == 'true'">