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 | 2d0b3724d6f7038d6cea5608b7c3be9637034b84 (patch) | |
| tree | 06accf2dda8737340b3f692183e6e49bbc6b833a | |
| parent | df48463191cc6b75a02c1a3c2d505977e992e370 (diff) | |
| download | vulkan-validation-layers-2d0b3724d6f7038d6cea5608b7c3be9637034b84.tar.gz | |
Adding input attachment access as optional for attachment optimal layouts.
Change-Id: I0ef3d1af2ef38d218f1721e98eb1d98b326cd340
| -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 48472a866..0390dc3d4 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: { |