Use const void * for the object pointers in TransferQueue

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

diff --git a/source/backends/vulkan/transferqueue.h b/source/backends/vulkan/transferqueue.h
index b8719d627513bd8962dec3df4c1b52ddd2a8dbc5..58b1bc2d6fa5f4743964c72d1e15e01305a97af0 100644 (file)
--- a/source/backends/vulkan/transferqueue.h
+++ b/source/backends/vulkan/transferqueue.h
@@ -31,7 +31,7 @@ private:
        struct PendingTransfer
        {
                unsigned order = 0;
-               unsigned buffer_index = 0;
+               int buffer_index = -1;
                std::size_t offset = 0;
                std::size_t size = 0;
                std::function<void()> synchronize;
@@ -42,28 +42,28 @@ private:
        std::size_t default_buffer_size = 16*1048576;
        std::vector<StagingBuffer> buffers;
        std::vector<PendingTransfer> transfers;
-       std::map<void *, unsigned> next_orders;
+       std::map<const void *, unsigned> next_orders;
 
 public:
        TransferQueue(Device &);
 
        template<typename S, typename T>
-       void *prepare_transfer(void *, bool, std::size_t, S &&, T &&);
+       void *prepare_transfer(const void *, bool, std::size_t, S &&, T &&);
 
 private:
-       PendingTransfer &prepare_transfer(void *, bool, std::size_t);
+       PendingTransfer &prepare_transfer(const void *, bool, std::size_t);
 
 public:
        void dispatch_transfers(VkCommandBuffer);
 };
 
 template<typename S, typename T>
-void *TransferQueue::prepare_transfer(void *object, bool ordered, 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(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.buffer_index<0 ? 0 : static_cast<char *>(buffers[pt.buffer_index].mapped_address)+pt.offset);
 }
 
 } // namespace GL