sync: Misc cleanup

Author: artem-lunarg

layers/sync/sync_submit.cpp

@@ -23,9 +23,7 @@
 namespace syncval {
 
 AcquiredImage::AcquiredImage(const PresentedImage& presented, ResourceUsageTag acq_tag)
-    : image(presented.image), generator(presented.range_gen), present_tag(presented.tag), acquire_tag(acq_tag) {}
-
-bool AcquiredImage::Invalid() const { return vvl::StateObject::Invalid(image); }
+    : image(presented.image), generator(presented.range_gen), acquire_tag(acq_tag), present_tag(presented.tag) {}
 
 SignalInfo::SignalInfo(const std::shared_ptr<const vvl::Semaphore>& semaphore_state, const BatchContextPtr& batch,
                        const SyncExecScope& exec_scope, uint64_t timeline_value)
@@ -929,7 +927,7 @@ PresentedImage::PresentedImage(std::shared_ptr<vvl::Swapchain>&& swapchain, uint
 bool PresentedImage::Invalid() const { return vvl::StateObject::Invalid(image); }
 
 // Export uses move semantics...
-void PresentedImage::ExportToSwapchain(SyncValidator&) {  // Include this argument to prove the const cast is safe
+void PresentedImage::ExportToSwapchain() {
     // If the swapchain is dead just ignore the present
     auto swap_lock = swapchain_state.lock();
     if (vvl::StateObject::Invalid(swap_lock)) return;

layers/sync/sync_submit.h

@@ -39,12 +39,16 @@ using CommandBufferConstPtr = std::shared_ptr<const vvl::CommandBuffer>;
 struct AcquiredImage {
     std::shared_ptr<const vvl::Image> image;
     subresource_adapter::ImageRangeGenerator generator;
-    ResourceUsageTag present_tag;
+
+    // Tag of the image acquire operation
     ResourceUsageTag acquire_tag;
-    bool Invalid() const;
+
+    // Last present before the acquire operation above.
+    // kInvalidTag if the image has never been presented
+    ResourceUsageTag present_tag;
 
     AcquiredImage() = default;
-    AcquiredImage(const PresentedImage &presented, ResourceUsageTag acq_tag);
+    AcquiredImage(const PresentedImage& presented, ResourceUsageTag acquire_tag);
 };
 
 // Information associated with a semaphore signal
@@ -171,7 +175,7 @@ struct PresentedImage : public PresentedImageRecord {
     // For non-previsously presented images..
     PresentedImage(std::shared_ptr<vvl::Swapchain> &&swapchain, uint32_t at_index);
     bool Invalid() const;
-    void ExportToSwapchain(SyncValidator &);
+    void ExportToSwapchain();
     void SetImage(uint32_t at_index);
 };
 using PresentedImages = std::vector<PresentedImage>;

layers/sync/sync_validation.cpp

@@ -253,7 +253,7 @@ void SyncValidator::WaitForFence(VkFence fence) {
         FenceHostSyncPoint& wait_for = fence_it->second;
         if (wait_for.queue_id != kQueueIdInvalid) {
             ApplyTaggedWait(wait_for.queue_id, wait_for.tag, {}, wait_for.queue_sync_tags);
-        } else if (!wait_for.acquired.Invalid()) {
+        } else if (!vvl::StateObject::Invalid(wait_for.acquired.image)) {
             ApplyAcquireWait(wait_for.acquired);
         }
         waitable_fences_.erase(fence_it);
@@ -2248,8 +2248,9 @@ void SyncValidator::PostCallRecordDeviceWaitIdle(VkDevice device, const RecordOb
     // The last signal is needed to represent the current timeline state.
     EnsureTimelineSignalsLimit(1);
 
-    // As we we've waited for everything on device, any waits are mooted. (except for acquires)
-    vvl::EraseIf(waitable_fences_, [](const auto& waitable) { return waitable.second.acquired.Invalid(); });
+    // Cleanup fence waits associated with queues. Acquire fence waits are preserved
+    auto is_queue_fence = [](const auto& waitable) { return waitable.second.queue_id != kQueueIdInvalid; };
+    vvl::EraseIf(waitable_fences_, is_queue_fence);
     host_waitable_semaphores_.clear();
 }
 
@@ -2312,7 +2313,7 @@ bool SyncValidator::ProcessQueuePresent(VkQueue queue, const VkPresentInfoKHR* p
         queue_state.SetLastBatch(std::move(batch));
         ApplySignalsUpdate(signals_update, queue_state.LastBatch());
         for (auto& presented : presented_images) {
-            presented.ExportToSwapchain(*this);
+            presented.ExportToSwapchain();
         }
     }
     return skip;