diff options
| author | Mark Lobodzinski <mark@lunarg.com> | 2015-12-03 15:42:32 -0700 |
|---|---|---|
| committer | Mark Lobodzinski <mark@lunarg.com> | 2015-12-03 15:52:57 -0700 |
| commit | d51e5a953e76e575359e8fe11a0f34b47e383b3c (patch) | |
| tree | d5f486e8c3b686ea71181ad07140d16ae559a576 | |
| parent | f1fca7dbe3e4169da3f3f4539963834d8e0a12ec (diff) | |
| download | usermoji-d51e5a953e76e575359e8fe11a0f34b47e383b3c.tar.xz | |
layers: Reenable memory barrier validation
| -rw-r--r-- | demos/cube.c | 4 | ||||
| -rw-r--r-- | demos/tri.c | 4 | ||||
| -rw-r--r-- | layers/draw_state.cpp | 5 |
3 files changed, 5 insertions, 8 deletions
diff --git a/demos/cube.c b/demos/cube.c index a336ee2f..30488ecd 100644 --- a/demos/cube.c +++ b/demos/cube.c @@ -510,11 +510,11 @@ static void demo_set_image_layout( } if (new_image_layout == VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL) { - image_memory_barrier.dstAccessMask = VK_ACCESS_COLOR_ATTACHMENT_READ_BIT; + image_memory_barrier.dstAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT; } if (new_image_layout == VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL) { - image_memory_barrier.dstAccessMask = VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT; + image_memory_barrier.dstAccessMask = VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT; } if (new_image_layout == VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL) { diff --git a/demos/tri.c b/demos/tri.c index d933700c..a1c2588c 100644 --- a/demos/tri.c +++ b/demos/tri.c @@ -354,11 +354,11 @@ static void demo_set_image_layout( } if (new_image_layout == VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL) { - image_memory_barrier.dstAccessMask = VK_ACCESS_COLOR_ATTACHMENT_READ_BIT; + image_memory_barrier.dstAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT; } if (new_image_layout == VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL) { - image_memory_barrier.dstAccessMask = VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_READ_BIT; + image_memory_barrier.dstAccessMask = VK_ACCESS_DEPTH_STENCIL_ATTACHMENT_WRITE_BIT; } if (new_image_layout == VK_IMAGE_LAYOUT_SHADER_READ_ONLY_OPTIMAL) { diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp index 78a4e6a4..fb9d7134 100644 --- a/layers/draw_state.cpp +++ b/layers/draw_state.cpp @@ -3727,9 +3727,6 @@ bool ValidateBarriers(VkCommandBuffer cmdBuffer, uint32_t memBarrierCount, const } } -/*********************************************************************************************************** -// Disable this validation until an optimal version is agreed upon - for (uint32_t i = 0; i < memBarrierCount; ++i) { auto mem_barrier = reinterpret_cast<const VkMemoryBarrier*>(ppMemBarriers[i]); if (mem_barrier && mem_barrier->sType == VK_STRUCTURE_TYPE_IMAGE_MEMORY_BARRIER) { @@ -3738,7 +3735,7 @@ bool ValidateBarriers(VkCommandBuffer cmdBuffer, uint32_t memBarrierCount, const skip_call |= ValidateMaskBitsFromLayouts(dev_data, cmdBuffer, image_mem_barrier->dstAccessMask, image_mem_barrier->newLayout); } } -******************************************************************************************************************/ + return skip_call; } |