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 db6cad18a6ebc8539bcecf2099c6845c96f6ee33..5330c53cebf91b574128c75490234c8730179610 100644 (file)
--- 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 3cf038685d68e919b838b17d9d90e8134e1c42e9..672fb5a2d9852417bc0b675f4e428d47f7f14319 100644 (file)
--- 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 b6bd823c5f8224c75c841176101ed711d5843914..0eef206aa6395f920a2454fe0522b3b1eec435c8 100644 (file)
--- 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 4db0a3327852e215912c776252bf7096cd37c295..dc68c3db88c9aed8f2587687e149ea2809cfdd20 100644 (file)
--- 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 f38ab877f75c7d73c2b7bd6f8e35a9a4eeebb000..1bc09be89272f06933d4276a67be453f152a1c05 100644 (file)
--- 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>