From: Jean-Philippe Bruyère <jp_bruyere@hotmail.com>
Date: Fri, 3 Dec 2021 23:19:21 +0000 (+0100)
Subject: update to vk.net-0.3.0-beta, moved to netcoreapp3.1
X-Git-Tag: v0.2.4-beta~6
X-Git-Url: https://git.osiis.dedyn.io/?a=commitdiff_plain;h=295289d49d974b71985bc0785c143afdffecc3ef;p=jp%2Fvke.net.git

update to vk.net-0.3.0-beta, moved to netcoreapp3.1
---

diff --git a/addons/Directory.Build.props b/addons/Directory.Build.props
index db6cad1..5330c53 100644
--- a/addons/Directory.Build.props
+++ b/addons/Directory.Build.props
@@ -4,7 +4,7 @@
 		<RootDirectory>$(MSBuildThisFileDirectory)../</RootDirectory>
 		<Deterministic>true</Deterministic>
 
-		<TargetFrameworks>netcoreapp3.0</TargetFrameworks>
+		<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
 
 		<RepositoryUrl>https://github.com/jpbruyere/vke.net</RepositoryUrl>
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
diff --git a/samples/ClearScreen/ClearScreen.csproj b/samples/ClearScreen/ClearScreen.csproj
index 3cf0386..672fb5a 100644
--- a/samples/ClearScreen/ClearScreen.csproj
+++ b/samples/ClearScreen/ClearScreen.csproj
@@ -1,5 +1,5 @@
-<Project Sdk="Microsoft.NET.Sdk">  
-  <PropertyGroup>		
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
     <IncludeDefaultNoneItems>false</IncludeDefaultNoneItems>
-  </PropertyGroup>  
+  </PropertyGroup>
 </Project>
diff --git a/vke/src/base/CommandBuffer.cs b/vke/src/base/CommandBuffer.cs
index b6bd823..0eef206 100644
--- a/vke/src/base/CommandBuffer.cs
+++ b/vke/src/base/CommandBuffer.cs
@@ -217,12 +217,10 @@ namespace vke {
 				return;
 			VkDebugMarkerMarkerInfoEXT info = VkDebugMarkerMarkerInfoEXT.New();
 			info.pMarkerName = name.Pin ();
-			unsafe {
-				info.color[0] = r;
-				info.color[1] = g;
-				info.color[2] = b;
-				info.color[3] = a;
-			}
+			info.color.X = r;
+			info.color.Y = g;
+			info.color.Z = b;
+			info.color.W = a;
 			vkCmdDebugMarkerBeginEXT (Handle, ref info);
 			name.Unpin ();
 		}
@@ -231,12 +229,10 @@ namespace vke {
 				return;
 			VkDebugMarkerMarkerInfoEXT info = VkDebugMarkerMarkerInfoEXT.New();
 			info.pMarkerName = name.Pin ();
-			unsafe {
-				info.color[0] = r;
-				info.color[1] = g;
-				info.color[2] = b;
-				info.color[3] = a;
-			}
+			info.color.X = r;
+			info.color.Y = g;
+			info.color.Z = b;
+			info.color.W = a;
 			vkCmdDebugMarkerInsertEXT (Handle, ref info);
 			name.Unpin ();
 		}
diff --git a/vke/src/base/GraphicPipeline.cs b/vke/src/base/GraphicPipeline.cs
index 4db0a33..dc68c3d 100644
--- a/vke/src/base/GraphicPipeline.cs
+++ b/vke/src/base/GraphicPipeline.cs
@@ -56,12 +56,7 @@ namespace vke {
 					VkPipelineColorBlendStateCreateInfo colorBlendInfo = VkPipelineColorBlendStateCreateInfo.New ();
 					colorBlendInfo.logicOpEnable = cfg.ColorBlendLogicOpEnable;
 					colorBlendInfo.logicOp = cfg.ColorBlendLogicOp;
-					unsafe {
-						colorBlendInfo.blendConstants[0] = cfg.ColorBlendConstants.X;
-						colorBlendInfo.blendConstants[1] = cfg.ColorBlendConstants.Y;
-						colorBlendInfo.blendConstants[2] = cfg.ColorBlendConstants.Z;
-						colorBlendInfo.blendConstants[3] = cfg.ColorBlendConstants.W;
-					}
+					colorBlendInfo.blendConstants = cfg.ColorBlendConstants;
 					colorBlendInfo.attachmentCount = (uint)cfg.blendAttachments.Count;
 					colorBlendInfo.pAttachments = cfg.blendAttachments.Pin (pctx);
 
diff --git a/vke/vke.csproj b/vke/vke.csproj
index f38ab87..1bc09be 100644
--- a/vke/vke.csproj
+++ b/vke/vke.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+		<TargetFramework>netcoreapp3.1</TargetFramework>
 
 		<ReleaseVersion>$(VkeReleaseVersion)</ReleaseVersion>
 
@@ -48,7 +48,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="SpirVTasks" Version="$(SpirVTasksPackageVersion)" />
-		<PackageReference Include="Vulkan" Version="0.2.5-beta" />
+		<PackageReference Include="Vulkan" Version="0.3.0-beta" />
 		<PackageReference Include="shaderc.net" Version="0.1.0" />
 		<PackageReference Include="glfw-sharp" Version="0.2.14" />
 	</ItemGroup>