X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbackends%2Fvulkan%2Ftransferqueue.h;h=58b1bc2d6fa5f4743964c72d1e15e01305a97af0;hb=c633fcc87e295ebc88b5847c44ca0da121652819;hp=419760bdf4d6b709bd4b28a393428f8da45f9383;hpb=99ca354f18119f82f1adeca100cd665a8f640317;p=libs%2Fgl.git

diff --git a/source/backends/vulkan/transferqueue.h b/source/backends/vulkan/transferqueue.h
index 419760bd..58b1bc2d 100644
--- 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<const 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(const void *, bool, std::size_t, S &&, T &&);
 
 private:
-	PendingTransfer &prepare_transfer(std::size_t);
+	PendingTransfer &prepare_transfer(const 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(const 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