vulkan: fix validation errors when generating mipmaps for a compute-w…

…ritable texture.
love2d · Sep 27, 2024 · d185eb8 · d185eb8
1 parent 876625d
commit d185eb8
Showing 1 changed file with 16 additions and 5 deletions.
diff --git a/src/modules/graphics/vulkan/Texture.cpp b/src/modules/graphics/vulkan/Texture.cpp
@@ -491,11 +491,22 @@ void Texture::generateMipmapsInternal()
 		blit.dstSubresource.baseArrayLayer = rootView.startLayer;
 		blit.dstSubresource.layerCount = static_cast<uint32_t>(layerCount);
 
-		vkCmdBlitImage(commandBuffer, 
-			textureImage, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
-			textureImage, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
-			1, &blit,
-			VK_FILTER_LINEAR);
+		if (imageLayout != VK_IMAGE_LAYOUT_GENERAL)
+		{
+			vkCmdBlitImage(commandBuffer,
+				textureImage, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL,
+				textureImage, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL,
+				1, &blit,
+				VK_FILTER_LINEAR);
+		}
+		else
+		{
+			vkCmdBlitImage(commandBuffer,
+				textureImage, VK_IMAGE_LAYOUT_GENERAL,
+				textureImage, VK_IMAGE_LAYOUT_GENERAL,
+				1, &blit,
+				VK_FILTER_LINEAR);
+		}
 
 		barrier.oldLayout = VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL;
 		barrier.newLayout = imageLayout;