| commit | 81e194b96b2f04566e826a6a93ecdc86c78b2961 | [log] [tgz] |
|---|---|---|
| author | Pyry Haulos <pyry.haulos@gmail.com> | Fri May 20 12:55:25 2016 -0700 |
| committer | Pyry Haulos <pyry.haulos@gmail.com> | Fri May 20 12:55:25 2016 -0700 |
| tree | 4c24ada0e0c11b7af918dc101a46d26c492faccc | |
| parent | 4d12ac56d608b1411997e154892a840edad11c4b [diff] | |
| parent | cbba64694164049d254ac1affaf1c5bf34beb4fa [diff] |
Merge pull request #16 from jchen10/image_layout Fix Pipeline barrier test
diff --git a/external/vulkancts/modules/vulkan/memory/vktMemoryPipelineBarrierTests.cpp b/external/vulkancts/modules/vulkan/memory/vktMemoryPipelineBarrierTests.cpp index e137b6f..467b6f8 100644 --- a/external/vulkancts/modules/vulkan/memory/vktMemoryPipelineBarrierTests.cpp +++ b/external/vulkancts/modules/vulkan/memory/vktMemoryPipelineBarrierTests.cpp
@@ -4496,7 +4496,7 @@ vk::VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT, vk::VK_ACCESS_TRANSFER_READ_BIT, - vk::VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, + vk::VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL, vk::VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, vk::VK_QUEUE_FAMILY_IGNORED,