From: Jean-Philippe Bruyère Date: Tue, 5 May 2020 15:26:28 +0000 (+0200) Subject: use CommanBuffer instead of PrimaryCmd where no submission is done X-Git-Tag: v0.1.21~7 X-Git-Url: https://git.osiis.dedyn.io/?a=commitdiff_plain;h=576a6c60477241a78d51a50723f04ca04b1639ed;p=jp%2Fvke.net.git use CommanBuffer instead of PrimaryCmd where no submission is done --- diff --git a/vke.net.sln b/vke.net.sln index d8f2139..98ce499 100644 --- a/vke.net.sln +++ b/vke.net.sln @@ -47,8 +47,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "deferred", "samples\deferre EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "pbr", "samples\pbr\pbr.csproj", "{7EB2430B-6BC0-4AE9-B1FA-57C3DB2AE1C5}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "pinball", "samples\pinball\pinball.csproj", "{615FD107-F5F0-4C0D-8D3F-C6F53D50273C}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vkeEditor", "samples\vkeEditor\vkeEditor.csproj", "{901AC007-7646-4171-A302-23E45C428F15}" EndProject Global @@ -175,16 +173,6 @@ Global {1D2A1968-8F04-4BE0-B03A-573F1F68AB66}.ReleaseSpirVTasks|Any CPU.ActiveCfg = Debug|Any CPU {1D2A1968-8F04-4BE0-B03A-573F1F68AB66}.BuildPackages|Any CPU.ActiveCfg = Release|Any CPU {1D2A1968-8F04-4BE0-B03A-573F1F68AB66}.BuildPackages|Any CPU.Build.0 = Release|Any CPU - {615FD107-F5F0-4C0D-8D3F-C6F53D50273C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {615FD107-F5F0-4C0D-8D3F-C6F53D50273C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {615FD107-F5F0-4C0D-8D3F-C6F53D50273C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {615FD107-F5F0-4C0D-8D3F-C6F53D50273C}.Release|Any CPU.Build.0 = Release|Any CPU - {615FD107-F5F0-4C0D-8D3F-C6F53D50273C}.DebugCrow|Any CPU.ActiveCfg = DebugCrow|Any CPU - {615FD107-F5F0-4C0D-8D3F-C6F53D50273C}.DebugCrow|Any CPU.Build.0 = DebugCrow|Any CPU - {615FD107-F5F0-4C0D-8D3F-C6F53D50273C}.ReleaseSpirVTasks|Any CPU.ActiveCfg = Debug|Any CPU - {615FD107-F5F0-4C0D-8D3F-C6F53D50273C}.ReleaseSpirVTasks|Any CPU.Build.0 = Debug|Any CPU - {615FD107-F5F0-4C0D-8D3F-C6F53D50273C}.BuildPackages|Any CPU.ActiveCfg = Release|Any CPU - {615FD107-F5F0-4C0D-8D3F-C6F53D50273C}.BuildPackages|Any CPU.Build.0 = Release|Any CPU {901AC007-7646-4171-A302-23E45C428F15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {901AC007-7646-4171-A302-23E45C428F15}.Debug|Any CPU.Build.0 = Debug|Any CPU {901AC007-7646-4171-A302-23E45C428F15}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -210,7 +198,6 @@ Global {124152F8-FAE6-4D4B-87B9-6074DD365E9B} = {16439374-B8DB-4643-8116-EB3358B49A12} {7EB2430B-6BC0-4AE9-B1FA-57C3DB2AE1C5} = {16439374-B8DB-4643-8116-EB3358B49A12} {1D2A1968-8F04-4BE0-B03A-573F1F68AB66} = {16439374-B8DB-4643-8116-EB3358B49A12} - {615FD107-F5F0-4C0D-8D3F-C6F53D50273C} = {16439374-B8DB-4643-8116-EB3358B49A12} {901AC007-7646-4171-A302-23E45C428F15} = {16439374-B8DB-4643-8116-EB3358B49A12} EndGlobalSection GlobalSection(MonoDevelopProperties) = preSolution diff --git a/vke/src/base/Image.cs b/vke/src/base/Image.cs index 0842794..53faf82 100644 --- a/vke/src/base/Image.cs +++ b/vke/src/base/Image.cs @@ -433,19 +433,19 @@ namespace vke { Descriptor.sampler = sampler; } - public void SetLayout (PrimaryCommandBuffer cmdbuffer, + public void SetLayout (CommandBuffer cmdbuffer, VkImageAspectFlags aspectMask, VkImageLayout newImageLayout) { SetLayout (cmdbuffer, aspectMask, lastKnownLayout, newImageLayout, lastKnownLayout.GetDefaultStage (), newImageLayout.GetDefaultStage ()); } - public void SetLayout (PrimaryCommandBuffer cmdbuffer, + public void SetLayout (CommandBuffer cmdbuffer, VkImageAspectFlags aspectMask, VkImageLayout oldImageLayout, VkImageLayout newImageLayout) { SetLayout (cmdbuffer, aspectMask, oldImageLayout, newImageLayout, oldImageLayout.GetDefaultStage (), newImageLayout.GetDefaultStage ()); } public void SetLayout ( - PrimaryCommandBuffer cmdbuffer, + CommandBuffer cmdbuffer, VkImageAspectFlags aspectMask, VkImageLayout oldImageLayout, VkImageLayout newImageLayout, @@ -460,7 +460,7 @@ namespace vke { SetLayout (cmdbuffer, oldImageLayout, newImageLayout, subresourceRange, srcStageMask, dstStageMask); } public void SetLayout ( - PrimaryCommandBuffer cmdbuffer, + CommandBuffer cmdbuffer, VkImageAspectFlags aspectMask, VkAccessFlags srcAccessMask, VkAccessFlags dstAccessMask, @@ -480,7 +480,7 @@ namespace vke { srcQueueFamilyIndex, dstQueueFamilyIndex); } public void SetLayout ( - PrimaryCommandBuffer cmdbuffer, + CommandBuffer cmdbuffer, VkAccessFlags srcAccessMask, VkAccessFlags dstAccessMask, VkImageLayout oldImageLayout, @@ -515,7 +515,7 @@ namespace vke { // an image and put it into an active command buffer // See chapter 11.4 "Image Layout" for details public void SetLayout ( - PrimaryCommandBuffer cmdbuffer, + CommandBuffer cmdbuffer, VkImageLayout oldImageLayout, VkImageLayout newImageLayout, VkImageSubresourceRange subresourceRange, @@ -653,7 +653,7 @@ namespace vke { /// Build mipmap chain for this image. Final layout will be ShaderReadOnlyOptimal. /// /// a command buffer to handle the operation. - public void BuildMipmaps (PrimaryCommandBuffer cmd) { + public void BuildMipmaps (CommandBuffer cmd) { VkImageSubresourceRange mipSubRange = new VkImageSubresourceRange (VkImageAspectFlags.Color, 0, 1, 0, info.arrayLayers); SetLayout (cmd, VkImageAspectFlags.Color, VkImageLayout.TransferDstOptimal); @@ -682,7 +682,7 @@ namespace vke { /// a command buffer to handle the blit operation. /// the destination image to blit to. /// filtering for the blit operation. - public void BlitTo (PrimaryCommandBuffer cmd, Image dest, VkFilter filter = VkFilter.Linear) { + public void BlitTo (CommandBuffer cmd, Image dest, VkFilter filter = VkFilter.Linear) { VkImageBlit imageBlit = new VkImageBlit { srcSubresource = new VkImageSubresourceLayers (VkImageAspectFlags.Color, info.arrayLayers, 0), srcOffsets_1 = new VkOffset3D ((int)info.extent.width, (int)info.extent.height, 1),