[Vulkan] Fix several validation warnings and errors.

* Use VkAttachmentLoadOp.Clear instead of Load in VkFramebuffer.cs. * Destroy the new VkRenderPass object being created in VkFramebuffer during disposal. * Don't set sampleShadingEnable in VkPipeline -- it doesn't do what I thought it does. * Use VkAttachmentLoadOp.DontCare when layout is undefined in VkPipeline.
veldrid · Apr 8, 2018 · 31ac583 · 31ac583
1 parent 18126ee
commit 31ac583
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/src/Veldrid/Vk/VkFramebuffer.cs b/src/Veldrid/Vk/VkFramebuffer.cs
@@ -141,7 +141,7 @@ public VkFramebuffer(VkGraphicsDevice gd, ref FramebufferDescription description
                 bool hasStencil = FormatHelpers.IsStencilFormat(DepthTarget.Value.Target.Format);
                 if (hasStencil)
                 {
-                    attachments[attachments.Count - 1].stencilLoadOp = VkAttachmentLoadOp.Load;
+                    attachments[attachments.Count - 1].stencilLoadOp = VkAttachmentLoadOp.Clear;
                 }
             }
 
@@ -266,6 +266,7 @@ public override void Dispose()
             {
                 vkDestroyFramebuffer(_gd.Device, _deviceFramebuffer, null);
                 vkDestroyRenderPass(_gd.Device, _renderPassNoClear, null);
+                vkDestroyRenderPass(_gd.Device, _renderPassNoClearLoad, null);
                 vkDestroyRenderPass(_gd.Device, _renderPassClear, null);
                 foreach (VkImageView view in _attachmentViews)
                 {

diff --git a/src/Veldrid/Vk/VkPipeline.cs b/src/Veldrid/Vk/VkPipeline.cs
@@ -114,10 +114,6 @@ public VkPipeline(VkGraphicsDevice gd, ref GraphicsPipelineDescription descripti
             VkPipelineMultisampleStateCreateInfo multisampleCI = VkPipelineMultisampleStateCreateInfo.New();
             VkSampleCountFlags vkSampleCount = VkFormats.VdToVkSampleCount(description.Outputs.SampleCount);
             multisampleCI.rasterizationSamples = vkSampleCount;
-            if (vkSampleCount != VkSampleCountFlags.Count1)
-            {
-                multisampleCI.sampleShadingEnable = true;
-            }
 
             pipelineCI.pMultisampleState = &multisampleCI;
 
@@ -252,7 +248,7 @@ public VkPipeline(VkGraphicsDevice gd, ref GraphicsPipelineDescription descripti
                 depthAttachmentDesc.samples = vkSampleCount;
                 depthAttachmentDesc.loadOp = VkAttachmentLoadOp.DontCare;
                 depthAttachmentDesc.storeOp = VkAttachmentStoreOp.Store;
-                depthAttachmentDesc.stencilLoadOp = hasStencil ? VkAttachmentLoadOp.Load : VkAttachmentLoadOp.DontCare;
+                depthAttachmentDesc.stencilLoadOp = VkAttachmentLoadOp.DontCare;
                 depthAttachmentDesc.stencilStoreOp = hasStencil ? VkAttachmentStoreOp.Store : VkAttachmentStoreOp.DontCare;
                 depthAttachmentDesc.initialLayout = VkImageLayout.Undefined;
                 depthAttachmentDesc.finalLayout = VkImageLayout.DepthStencilAttachmentOptimal;