Merge branch 'cherry-pick-validation-fixes' into 'vulkan-cts-1.0'
Cherry-pick validation fixes to release branch
See merge request !563
diff --git a/external/vulkancts/README.md b/external/vulkancts/README.md
index 7985148..da65ca3 100644
--- a/external/vulkancts/README.md
+++ b/external/vulkancts/README.md
@@ -218,7 +218,7 @@
If the submission package covers multiple products, you can list them by appending
additional `PRODUCT:` lines to the conformance statement. For example:
- CONFORM_VERSION: vulkan-cts-1.0.0-internal
+ CONFORM_VERSION: vulkan-cts-1.0.0.2
PRODUCT: Product A
PRODUCT: Product B
...
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,
