layers:Disable memory access callback

This is a conservative measure to simplify landing and integration of
the memory access checks. For now turning off the callback and also
disabling some draw-time checks that seem to have ~10-20% perf hit in
limited testing. Turning off callback also means turning off tests that
rely on the callback.
Will continue advancing this code and testing with checks enabled to
reach desired functionality before enabling code on master.

Author: tobine

layers/buffer_validation.cpp

@@ -688,6 +688,11 @@ bool MemoryConflict(MemoryAccess const *initial_access, MemoryAccess const *seco
 
 bool FlagMemoryAccessError(debug_report_data const *report_data, VkCommandBuffer command_buffer, const MemoryAccess *first_access,
                            const MemoryAccess *second_access, const char *caller) {
+#ifndef ENABLE_MEMORY_ACCESS_CALLBACK
+    // TODO: Temporarily disabling this callback until memory access code more thoroughly tested
+    //  Remove this early return to enable the callback
+    return false;
+#endif
     const char *first_type = first_access->write ? "write" : "read";
     const char *second_type = second_access->write ? "write" : "read";
     std::string inter_cb_info = "";

layers/core_validation.cpp

@@ -5857,6 +5857,12 @@ static bool ValidateCmdDrawType(layer_data *dev_data, VkCommandBuffer cmd_buffer
         skip |= ValidateDrawState(dev_data, *cb_state, indexed, bind_point, caller, dynamic_state_msg_code);
         skip |= (VK_PIPELINE_BIND_POINT_GRAPHICS == bind_point) ? outsideRenderPass(dev_data, *cb_state, caller, msg_code)
                                                                 : insideRenderPass(dev_data, *cb_state, caller, msg_code);
+#ifndef ENABLE_MEMORY_ACCESS_CALLBACK
+        // TODO : Early return here to skip the memory access checking below. The checks are functional but cause a perf hit
+        //  and the callback that's used is disabled, so also turning off these checks for now.
+        //  To re-enable the checks, just remove this early return
+        return skip;
+#endif
         // Grab mem accesses for this draw & check for missing synchs
         auto const &state = (*cb_state)->lastBound[bind_point];
         PIPELINE_STATE *pPipe = state.pipeline_state;

tests/layer_validation_tests.cpp

@@ -10197,6 +10197,7 @@ TEST_F(VkLayerTest, UpdateBufferWithinRenderPass) {
     m_errorMonitor->VerifyFound();
 }
 
+#ifdef ENABLE_MEMORY_ACCESS_CALLBACK
 TEST_F(VkLayerTest, DrawWithBufferWaRandRaWConflicts) {
     TEST_DESCRIPTION(
         "Attempt a draw that reads from a buffer that was written to and writes"
@@ -10483,11 +10484,7 @@ TEST_F(VkPositiveLayerTest, MultiCBDrawWithBufferWaRandRaWSynchChain) {
     vkCmdSetViewport(cmd_bufs[2], 0, 1, &viewport);
     VkRect2D scissor = {{0, 0}, {16, 16}};
     vkCmdSetScissor(cmd_bufs[2], 0, 1, &scissor);
-    // Should now trigger RaW and WaR errors at Draw time
-    //    m_errorMonitor->SetDesiredFailureMsg(VK_DEBUG_REPORT_WARNING_BIT_EXT, " causes a read after write conflict with ");
-    //    m_errorMonitor->SetDesiredFailureMsg(VK_DEBUG_REPORT_WARNING_BIT_EXT, " causes a write after read conflict with ");
     vkCmdDraw(cmd_bufs[2], 3, 1, 0, 0);
-    //    m_errorMonitor->VerifyFound();
     vkCmdEndRenderPass(cmd_bufs[2]);
     vkEndCommandBuffer(cmd_bufs[2]);
 
@@ -10501,7 +10498,7 @@ TEST_F(VkPositiveLayerTest, MultiCBDrawWithBufferWaRandRaWSynchChain) {
     m_errorMonitor->VerifyNotFound();
     vkDestroyPipelineLayout(m_device->device(), pipeline_layout, nullptr);
 }
-
+#endif
 TEST_F(VkPositiveLayerTest, UpdateBufferRaWDependencyWithBarrier) {
     TEST_DESCRIPTION("Update buffer used in CmdDrawIndirect w/ barrier before use");
 
@@ -10597,6 +10594,7 @@ TEST_F(VkPositiveLayerTest, UpdateBufferWaRDependencyWithTwoBarrierChain) {
     m_errorMonitor->VerifyNotFound();
 }
 
+#ifdef ENABLE_MEMORY_ACCESS_CALLBACK
 TEST_F(VkLayerTest, UpdateBufferRaWDependencyMissingBarrier) {
     TEST_DESCRIPTION("Update buffer used in CmdDrawIndirect without a barrier before use");
 
@@ -10740,7 +10738,7 @@ TEST_F(VkLayerTest, TwoCommandBufferUpdateBufferRaWDependencyMissingBarrier) {
 
     vkDestroyPipelineLayout(m_device->device(), pipeline_layout, nullptr);
 }
-
+#endif
 TEST_F(VkLayerTest, ClearColorImageWithBadRange) {
     TEST_DESCRIPTION("Record clear color with an invalid VkImageSubresourceRange");