Support transfers with no staged data

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

diff --git a/source/backends/vulkan/transferqueue.h b/source/backends/vulkan/transferqueue.h
index 419760bdf4d6b709bd4b28a393428f8da45f9383..b11b4503d59c78a0a60c77c2c905135ad714f57e 100644 (file)
--- a/source/backends/vulkan/transferqueue.h
+++ b/source/backends/vulkan/transferqueue.h
@@ -28,40 +28,42 @@ private:
                ~StagingBuffer();
        };
 
-       using TransferCallback = void(VkCommandBuffer, VkBuffer, std::size_t);
-
        struct PendingTransfer
        {
-               unsigned buffer_index = 0;
+               unsigned order = 0;
+               int buffer_index = -1;
                std::size_t offset = 0;
                std::size_t size = 0;
-               std::function<TransferCallback> callback;
+               std::function<void()> synchronize;
+               std::function<void(VkCommandBuffer, VkBuffer, std::size_t)> transfer;
        };
 
        Device &device;
        std::size_t default_buffer_size = 16*1048576;
        std::vector<StagingBuffer> buffers;
        std::vector<PendingTransfer> transfers;
+       std::map<void *, unsigned> next_orders;
 
 public:
        TransferQueue(Device &);
 
-       template<typename T>
-       void *prepare_transfer(std::size_t, T &&);
+       template<typename S, typename T>
+       void *prepare_transfer(void *, bool, std::size_t, S &&, T &&);
 
 private:
-       PendingTransfer &prepare_transfer(std::size_t);
+       PendingTransfer &prepare_transfer(void *, bool, std::size_t);
 
 public:
        void dispatch_transfers(VkCommandBuffer);
 };
 
-template<typename T>
-void *TransferQueue::prepare_transfer(std::size_t size, T &&callback)
+template<typename S, typename T>
+void *TransferQueue::prepare_transfer(void *object, bool ordered, std::size_t size, S &&synchronize, T &&transfer)
 {
-       PendingTransfer &pt = prepare_transfer(size);
-       pt.callback = std::forward<T>(callback);
-       return static_cast<char *>(buffers[pt.buffer_index].mapped_address)+pt.offset;
+       PendingTransfer &pt = prepare_transfer(object, ordered, size);
+       pt.synchronize = std::forward<S>(synchronize);
+       pt.transfer = std::forward<T>(transfer);
+       return (pt.buffer_index<0 ? 0 : static_cast<char *>(buffers[pt.buffer_index].mapped_address)+pt.offset);
 }
 
 } // namespace GL