commit 5f6ba8e330c321f78e12f0eb8453ba44322fa376
author Mark Lobodzinski <mark@lunarg.com> Wed Nov 04 13:51:23 2015 -0700
committer Mark Lobodzinski <mark@lunarg.com> Wed Nov 04 14:01:40 2015 -0700
tree 3635ce022d9fe62b19c7697c1c1248ce11e6af49
parent 56501156a4bb9c9c0bd5558f938df0c8a3eb74ea

layers: Fix some bugs in the memory barrier validation code

Fix some merge-request related issues in DrawState

layers/draw_state.cpp

diff --git a/layers/draw_state.cpp b/layers/draw_state.cpp
index d6dad7e..5580994 100644
--- a/layers/draw_state.cpp
+++ b/layers/draw_state.cpp
@@ -3321,7 +3321,7 @@
 
 bool ValidateOutputMaskBits(const layer_data* my_data, VkCommandBuffer cmdBuffer, const VkImageMemoryBarrier* image_mem_barrier, VkAccessFlags bit) {
     bool skip_call = false;
-    if (image_mem_barrier->srcAccessMask | bit) {
+    if (image_mem_barrier->srcAccessMask & bit) {
         if (image_mem_barrier->srcAccessMask != bit) {
             skip_call |= log_msg(my_data->report_data, VK_DBG_REPORT_WARN_BIT, (VkDbgObjectType)0, 0, 0, DRAWSTATE_INVALID_BARRIER, "DS",
                                  "Additional bits in srcAccessMask %d are specified when source layout is %d.", image_mem_barrier->srcAccessMask, image_mem_barrier->oldLayout);
@@ -3336,28 +3336,28 @@
 //TODO: Combine this with function below
 bool ValidateInputMaskBits(const layer_data* my_data, VkCommandBuffer cmdBuffer, const VkImageMemoryBarrier* image_mem_barrier, VkAccessFlags bit) {
     bool skip_call = false;
-    if (image_mem_barrier->dstAccessMask | bit) {
+    if (image_mem_barrier->dstAccessMask & bit) {
         if (image_mem_barrier->dstAccessMask != bit) {
             skip_call |= log_msg(my_data->report_data, VK_DBG_REPORT_WARN_BIT, (VkDbgObjectType)0, 0, 0, DRAWSTATE_INVALID_BARRIER, "DS",
                                  "Additional bits in dstAccessMask %d are specified when dest layout is %d.", image_mem_barrier->srcAccessMask, image_mem_barrier->newLayout);
         }
     } else {
         skip_call |= log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, DRAWSTATE_INVALID_BARRIER, "DS",
-                             "Cannot specify srcAccessMask %d without %d when dest layout is %d.", image_mem_barrier->srcAccessMask, bit, image_mem_barrier->newLayout);
+                             "Cannot specify dstAccessMask %d without %d when dest layout is %d.", image_mem_barrier->srcAccessMask, bit, image_mem_barrier->newLayout);
     }
     return skip_call;
 }
 
 bool ValidateInputMaskBits(const layer_data* my_data, VkCommandBuffer cmdBuffer, const VkImageMemoryBarrier* image_mem_barrier, VkAccessFlags bit1, VkAccessFlags bit2) {
     bool skip_call = false;
-    if (image_mem_barrier->dstAccessMask | bit1 || image_mem_barrier->dstAccessMask | bit2) {
+    if (image_mem_barrier->dstAccessMask & bit1 || image_mem_barrier->dstAccessMask & bit2) {
         if (image_mem_barrier->dstAccessMask & !(bit1 | bit2)) {
             skip_call |= log_msg(my_data->report_data, VK_DBG_REPORT_WARN_BIT, (VkDbgObjectType)0, 0, 0, DRAWSTATE_INVALID_BARRIER, "DS",
                                  "Additional bits in dstAccessMask %d are specified when dest layout is %d.", image_mem_barrier->srcAccessMask, image_mem_barrier->newLayout);
         }
     } else {
         skip_call |= log_msg(my_data->report_data, VK_DBG_REPORT_ERROR_BIT, (VkDbgObjectType)0, 0, 0, DRAWSTATE_INVALID_BARRIER, "DS",
-                             "Cannot specify srcAccessMask %d without %d or %d when dest layout is %d.", image_mem_barrier->srcAccessMask, bit1, bit2, image_mem_barrier->newLayout);
+                             "Cannot specify dstAccessMask %d without %d or %d when dest layout is %d.", image_mem_barrier->srcAccessMask, bit1, bit2, image_mem_barrier->newLayout);
     }
     return skip_call;
 }