From 870d14110b63d2f66df05f5fae39dbb122529855 Mon Sep 17 00:00:00 2001
From: pezcode <pezcode@users.noreply.github.com>
Date: Wed, 7 Apr 2021 16:21:02 +0200
Subject: [PATCH] Vulkan: allow writing to gl_FragColor without framebuffer
 color attachment (#2452)

---
 .../15-shadowmaps-simple/fs_sms_shadow.sc     |  3 ---
 src/renderer_vk.cpp                           | 23 ++++++++-----------
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/examples/15-shadowmaps-simple/fs_sms_shadow.sc b/examples/15-shadowmaps-simple/fs_sms_shadow.sc
index ff26f3891..3cdf1973f 100644
--- a/examples/15-shadowmaps-simple/fs_sms_shadow.sc
+++ b/examples/15-shadowmaps-simple/fs_sms_shadow.sc
@@ -7,8 +7,5 @@
 
 void main()
 {
-	// Vulkan does not like shader writing to a target that is not attached
-#ifndef BGFX_SHADER_LANGUAGE_SPIRV
 	gl_FragColor = vec4_splat(0.0);
-#endif
 }
diff --git a/src/renderer_vk.cpp b/src/renderer_vk.cpp
index ffd0a1293..8bc6589db 100644
--- a/src/renderer_vk.cpp
+++ b/src/renderer_vk.cpp
@@ -3832,24 +3832,26 @@ VK_IMPORT_DEVICE
 			// cache missed
 			VkAttachmentDescription ad[BGFX_CONFIG_MAX_FRAME_BUFFER_ATTACHMENTS];
 			VkAttachmentReference colorAr[BGFX_CONFIG_MAX_FRAME_BUFFER_ATTACHMENTS];
-			VkAttachmentReference resolveAr[BGFX_CONFIG_MAX_FRAME_BUFFER_ATTACHMENTS];
 			VkAttachmentReference depthAr;
 			uint32_t numColorAr = 0;
 
+			colorAr[0].attachment = VK_ATTACHMENT_UNUSED;
+			colorAr[0].layout     = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
+
 			depthAr.attachment = VK_ATTACHMENT_UNUSED;
 			depthAr.layout     = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
 
 			for (uint8_t ii = 0; ii < _num; ++ii)
 			{
 				TextureVK& texture = m_textures[_attachments[ii].handle.idx];
-				ad[ii].flags       = 0;
-				ad[ii].format      = texture.m_format;
-				ad[ii].samples     = texture.m_sampler.Sample;
+				ad[ii].flags   = 0;
+				ad[ii].format  = texture.m_format;
+				ad[ii].samples = texture.m_sampler.Sample;
+				ad[ii].loadOp  = VK_ATTACHMENT_LOAD_OP_LOAD;
+				ad[ii].storeOp = VK_ATTACHMENT_STORE_OP_STORE;
 
 				if (texture.m_aspectMask & VK_IMAGE_ASPECT_COLOR_BIT)
 				{
-					ad[ii].loadOp                  = VK_ATTACHMENT_LOAD_OP_LOAD;
-					ad[ii].storeOp                 = VK_ATTACHMENT_STORE_OP_STORE;
 					ad[ii].stencilLoadOp           = VK_ATTACHMENT_LOAD_OP_DONT_CARE;
 					ad[ii].stencilStoreOp          = VK_ATTACHMENT_STORE_OP_DONT_CARE;
 					ad[ii].initialLayout           = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL;
@@ -3860,8 +3862,6 @@ VK_IMPORT_DEVICE
 				}
 				else if (texture.m_aspectMask & VK_IMAGE_ASPECT_DEPTH_BIT)
 				{
-					ad[ii].loadOp         = VK_ATTACHMENT_LOAD_OP_LOAD;
-					ad[ii].storeOp        = VK_ATTACHMENT_STORE_OP_STORE;
 					ad[ii].stencilLoadOp  = VK_ATTACHMENT_LOAD_OP_LOAD;
 					ad[ii].stencilStoreOp = VK_ATTACHMENT_STORE_OP_STORE;
 					ad[ii].initialLayout  = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
@@ -3869,9 +3869,6 @@ VK_IMPORT_DEVICE
 					depthAr.layout        = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL;
 					depthAr.attachment    = ii;
 				}
-
-				resolveAr[ii].attachment = VK_ATTACHMENT_UNUSED;
-				resolveAr[ii].layout     = ad[ii].initialLayout;
 			}
 
 			VkSubpassDescription sd[1];
@@ -3879,9 +3876,9 @@ VK_IMPORT_DEVICE
 			sd[0].pipelineBindPoint       = VK_PIPELINE_BIND_POINT_GRAPHICS;
 			sd[0].inputAttachmentCount    = 0;
 			sd[0].pInputAttachments       = NULL;
-			sd[0].colorAttachmentCount    = numColorAr;
+			sd[0].colorAttachmentCount    = bx::max<uint32_t>(numColorAr, 1);
 			sd[0].pColorAttachments       = colorAr;
-			sd[0].pResolveAttachments     = resolveAr;
+			sd[0].pResolveAttachments     = NULL;
 			sd[0].pDepthStencilAttachment = &depthAr;
 			sd[0].preserveAttachmentCount = 0;
 			sd[0].pPreserveAttachments    = NULL;