commit | 7c09144947dc0ff8ab6b1b9396f21998e077c6c8 | [log] [tgz] |
---|---|---|
author | Alexander Galazin <alexander.galazin@arm.com> | Wed Aug 14 13:52:47 2019 +0200 |
committer | Alexander Galazin <alexander.galazin@arm.com> | Wed Aug 14 13:52:47 2019 +0200 |
tree | b42bd674d1843d6c303f8b7d2fa0d0d9f5562a0e | |
parent | 274a2078a7b0d9be5e44e2b11dc3c86342a9b1c8 [diff] | |
parent | d0e2ecf0965afe9dee26b40feabcc0596d0f6e7a [diff] |
Merge vk-gl-cts/vulkan-cts-1.1.2 into vk-gl-cts/vulkan-cts-1.1.3 Change-Id: I7f00708e05e1cf20c6439e52287d21eacf32ca01
diff --git a/external/vulkancts/modules/vulkan/memory/vktMemoryPipelineBarrierTests.cpp b/external/vulkancts/modules/vulkan/memory/vktMemoryPipelineBarrierTests.cpp index 9d7b006..0cf2170 100644 --- a/external/vulkancts/modules/vulkan/memory/vktMemoryPipelineBarrierTests.cpp +++ b/external/vulkancts/modules/vulkan/memory/vktMemoryPipelineBarrierTests.cpp
@@ -7928,7 +7928,7 @@ DE_ASSERT(supportedLayoutCount > 0); - size_t nextLayoutNdx = ((size_t)rng.getUint64()) % (previousLayout == vk::VK_IMAGE_LAYOUT_UNDEFINED + size_t nextLayoutNdx = ((size_t)rng.getUint32()) % (previousLayout == vk::VK_IMAGE_LAYOUT_UNDEFINED ? supportedLayoutCount : supportedLayoutCount - 1);