X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fbackends%2Fvulkan%2Ftransferqueue.cpp;h=f356510e4b3a02d57dddb387825eb478ea88fa37;hb=c633fcc87e295ebc88b5847c44ca0da121652819;hp=d0ccb0d571c88419838faec234a7cd99e0f7fcd9;hpb=644b81d62660bafa702bfd7acedd3a0039aad993;p=libs%2Fgl.git diff --git a/source/backends/vulkan/transferqueue.cpp b/source/backends/vulkan/transferqueue.cpp index d0ccb0d5..f356510e 100644 --- a/source/backends/vulkan/transferqueue.cpp +++ b/source/backends/vulkan/transferqueue.cpp @@ -12,38 +12,60 @@ TransferQueue::TransferQueue(Device &d): device(d) { } -TransferQueue::PendingTransfer &TransferQueue::prepare_transfer(size_t size) +TransferQueue::PendingTransfer &TransferQueue::prepare_transfer(const void *object, bool ordered, size_t size) { - auto i = find_if(buffers, [size](const StagingBuffer &b){ return b.used+size<=b.size; }); - if(i==buffers.end()) + unsigned &order = next_orders[object]; + order += !order; + order += (order&1)|ordered; + + auto j = upper_bound_member(transfers, order, &PendingTransfer::order); + + PendingTransfer &transfer = *transfers.emplace(j); + transfer.order = order; + + if(size) { - buffers.emplace_back(device, max(default_buffer_size, size)); - i = prev(buffers.end()); + auto i = find_if(buffers, [size](const StagingBuffer &b){ return b.used+size<=b.size; }); + if(i==buffers.end()) + { + buffers.emplace_back(device, max(default_buffer_size, size)); + i = prev(buffers.end()); + } + + transfer.buffer_index = distance(buffers.begin(), i); + transfer.offset = i->used; + transfer.size = size; + + i->used += size; } - PendingTransfer transfer; - transfer.buffer_index = distance(buffers.begin(), i); - transfer.offset = i->used; - transfer.size = size; - transfers.push_back(transfer); - - i->used += size; + order += ordered; - return transfers.back(); + return transfer; } void TransferQueue::dispatch_transfers(VkCommandBuffer command_buffer) { - if(!transfers.empty()) - device.get_synchronizer().barrier(command_buffer); + if(transfers.empty()) + return; - for(const PendingTransfer &t: transfers) + for(auto i=transfers.begin(); i!=transfers.end(); ) { - VkBuffer buffer = buffers[t.buffer_index].buffer; - t.callback(command_buffer, buffer, t.offset); + auto j = i; + for(; (j!=transfers.end() && j->order==i->order); ++j) + j->synchronize(); + + device.get_synchronizer().barrier(command_buffer); + + for(; i!=j; ++i) + { + VkBuffer buffer = (i->buffer_index>=0 ? buffers[i->buffer_index].buffer : 0); + i->transfer(command_buffer, buffer, i->offset); + } } transfers.clear(); + next_orders.clear(); }