mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-07-25 08:14:45 +02:00
Fix another case where we trusted std::move to clear the origin, which is not guaranteed.
This commit is contained in:
@@ -1039,6 +1039,8 @@ void VulkanDeleteList::Take(VulkanDeleteList &del) {
|
||||
assert(pipelineCaches_.size() == 0);
|
||||
assert(renderPasses_.size() == 0);
|
||||
assert(framebuffers_.size() == 0);
|
||||
assert(pipelineLayouts_.size() == 0);
|
||||
assert(descSetLayouts_.size() == 0);
|
||||
assert(callbacks_.size() == 0);
|
||||
cmdPools_ = std::move(del.cmdPools_);
|
||||
descPools_ = std::move(del.descPools_);
|
||||
@@ -1056,6 +1058,21 @@ void VulkanDeleteList::Take(VulkanDeleteList &del) {
|
||||
pipelineLayouts_ = std::move(del.pipelineLayouts_);
|
||||
descSetLayouts_ = std::move(del.descSetLayouts_);
|
||||
callbacks_ = std::move(del.callbacks_);
|
||||
del.cmdPools_.clear();
|
||||
del.descPools_.clear();
|
||||
del.modules_.clear();
|
||||
del.buffers_.clear();
|
||||
del.images_.clear();
|
||||
del.imageViews_.clear();
|
||||
del.deviceMemory_.clear();
|
||||
del.samplers_.clear();
|
||||
del.pipelines_.clear();
|
||||
del.pipelineCaches_.clear();
|
||||
del.renderPasses_.clear();
|
||||
del.framebuffers_.clear();
|
||||
del.pipelineLayouts_.clear();
|
||||
del.descSetLayouts_.clear();
|
||||
del.callbacks_.clear();
|
||||
}
|
||||
|
||||
void VulkanDeleteList::PerformDeletes(VkDevice device) {
|
||||
|
||||
@@ -353,7 +353,7 @@ void VulkanDeviceAllocator::ExecuteFree(FreeInfo *userdata) {
|
||||
slab.allocSizes.erase(it);
|
||||
} else {
|
||||
// Ack, a double free?
|
||||
Crash();
|
||||
_assert_msg_(G3D, false, "Double free? Block missing at offset %d", userdata->offset);
|
||||
}
|
||||
found = true;
|
||||
break;
|
||||
|
||||
@@ -180,7 +180,7 @@ private:
|
||||
|
||||
static void DispatchFree(void *userdata) {
|
||||
auto freeInfo = static_cast<FreeInfo *>(userdata);
|
||||
freeInfo->allocator->ExecuteFree(freeInfo);
|
||||
freeInfo->allocator->ExecuteFree(freeInfo); // this deletes freeInfo
|
||||
}
|
||||
|
||||
bool AllocateSlab(VkDeviceSize minBytes);
|
||||
|
||||
Reference in New Issue
Block a user