Allow VK_IMAGE_LAYOUT_GENERAL in vkCmdCopyImageToBuffer

You can use VK_IMAGE_LAYOUT_GENERAL for anything. Bug: b/nnn Test: dEQP-VK.image.* Change-Id: I5ca7612e6957c6adc97055861cdbe2addf665b92 Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/30668Tested-by: Chris Forbes <chrisforbes@google.com> Presubmit-Ready: Chris Forbes <chrisforbes@google.com> Reviewed-by: Alexis Hétu <sugoi@google.com> Reviewed-by: Nicolas Capens <nicolascapens@google.com> Kokoro-Presubmit: kokoro <noreply+kokoro@google.com>

Allow VK_IMAGE_LAYOUT_GENERAL in vkCmdCopyImageToBuffer
a2457f79 · Chris Forbes · c71c17f6 · a2457f79
Commit a2457f79 authored May 04, 2019 by Chris Forbes
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

VkCommandBuffer.cpp src/Vulkan/VkCommandBuffer.cpp +1 -1

No files found.
--- a/src/Vulkan/VkCommandBuffer.cpp
+++ b/src/Vulkan/VkCommandBuffer.cpp
@@ -1378,7 +1378,7 @@ void CommandBuffer::copyImageToBuffer(VkImage srcImage, VkImageLayout srcImageLa
 	uint32_t regionCount, const VkBufferImageCopy* pRegions)
 {
 	ASSERT(state == RECORDING);
-	ASSERT(srcImageLayout == VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL);
+	ASSERT(srcImageLayout == VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL || srcImageLayout == VK_IMAGE_LAYOUT_GENERAL);
 	for(uint32_t i = 0; i < regionCount; i++)
 	{