diff options
| author | Jan-Harald Fredriksen <jan-harald.fredriksen@arm.com> | 2016-10-21 15:14:16 +0200 |
|---|---|---|
| committer | Tobin Ehlis <tobine@google.com> | 2016-10-21 15:11:12 -0600 |
| commit | 70064679aeb8ec69445c5190db3381a80b97667b (patch) | |
| tree | 09dc9312e6a71e812bf81a027813c66b63cf648e /layers/core_validation.cpp | |
| parent | 5ff13184b8ee6a45e67f0ad95dd60553ce0b3a75 (diff) | |
| download | usermoji-70064679aeb8ec69445c5190db3381a80b97667b.tar.xz | |
Adding input attachment access as optional for attachment optimal layouts.
Change-Id: I0ef3d1af2ef38d218f1721e98eb1d98b326cd340
Diffstat (limited to 'layers/core_validation.cpp')
| -rw-r--r-- | layers/core_validation.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp index 48472a86..0390dc3d 100644 --- a/layers/core_validation.cpp +++ b/layers/core_validation.cpp @@ -8810,12 +8810,12 @@ static bool ValidateMaskBitsFromLayouts(const layer_data *my_data, VkCommandBuff switch (layout) { case VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL: { skip_call |= ValidateMaskBits(my_data, cmdBuffer, accessMask, layout, VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT, - VK_ACCESS_COLOR_ATTACHMENT_READ_BIT, type); + VK_ACCESS_COLOR_ATTACHMENT_READ_BIT | VK_ACCESS_INPUT_ATTACHMENT_READ_BIT, type); break; } case VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL: { skip_call |= ValidateMaskBits(my_data, cmdBuffer, accessMask, layout, VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT, - VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT, type); + VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT | VK_ACCESS_INPUT_ATTACHMENT_READ_BIT, type); break; } case VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL: { @@ -8828,7 +8828,8 @@ static bool ValidateMaskBitsFromLayouts(const layer_data *my_data, VkCommandBuff } case VK_IMAGE_LAYOUT_DEPTH_STENCIL_READ_ONLY_OPTIMAL: { skip_call |= ValidateMaskBits(my_data, cmdBuffer, accessMask, layout, 0, - VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT | VK_ACCESS_SHADER_READ_BIT, type); + VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT | + VK_ACCESS_SHADER_READ_BIT | VK_ACCESS_INPUT_ATTACHMENT_READ_BIT, type); break; } case VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL: { |