Refactor TransferQueue to require explicit finalization of transfers

[libs/gl.git] / source / backends / vulkan / transferqueue.h

diff --git a/source/backends/vulkan/transferqueue.h b/source/backends/vulkan/transferqueue.h
index a25519c8a121b417b0fe1dc1a60692bc7f7f90ff..592bb69e1303458870842391c2d1ad41ba44049f 100644 (file)
--- a/source/backends/vulkan/transferqueue.h
+++ b/source/backends/vulkan/transferqueue.h
@@ -30,9 +30,12 @@ private:
 
        struct PendingTransfer
        {
-               unsigned buffer_index = 0;
+               const void *object = 0;
+               unsigned order = 0;
+               int buffer_index = -1;
                std::size_t offset = 0;
                std::size_t size = 0;
+               void *staging_address = 0;
                std::function<void()> synchronize;
                std::function<void(VkCommandBuffer, VkBuffer, std::size_t)> transfer;
        };
@@ -41,27 +44,37 @@ private:
        std::size_t default_buffer_size = 16*1048576;
        std::vector<StagingBuffer> buffers;
        std::vector<PendingTransfer> transfers;
+       std::vector<PendingTransfer> async_transfers;
+       std::map<const void *, unsigned> next_orders;
 
 public:
        TransferQueue(Device &);
 
        template<typename S, typename T>
-       void *prepare_transfer(std::size_t, S &&, T &&);
+       void *prepare_transfer(const void *, bool, std::size_t, S &&, T &&);
+
+       template<typename S, typename T>
+       void prepare_transfer(const void *o, bool r, S &&s, T &&t)
+       { prepare_transfer(o, r, 0, std::forward<S>(s), std::forward<T>(t)); }
+
+       void finalize_transfer(void *);
 
 private:
-       PendingTransfer &prepare_transfer(std::size_t);
+       void allocate_staging(PendingTransfer &, std::size_t);
+       PendingTransfer &prepare_transfer(const void *, bool, std::size_t);
+       PendingTransfer &insert_transfer(PendingTransfer &&);
 
 public:
        void dispatch_transfers(VkCommandBuffer);
 };
 
 template<typename S, typename T>
-void *TransferQueue::prepare_transfer(std::size_t size, S &&synchronize, T &&transfer)
+void *TransferQueue::prepare_transfer(const void *object, bool ordered, std::size_t size, S &&synchronize, T &&transfer)
 {
-       PendingTransfer &pt = prepare_transfer(size);
+       PendingTransfer &pt = prepare_transfer(object, ordered, size);
        pt.synchronize = std::forward<S>(synchronize);
        pt.transfer = std::forward<T>(transfer);
-       return static_cast<char *>(buffers[pt.buffer_index].mapped_address)+pt.offset;
+       return pt.staging_address;
 }
 
 } // namespace GL