diff options
| author | 2022-10-06 21:29:53 +0200 | |
|---|---|---|
| committer | 2022-10-06 21:29:53 +0200 | |
| commit | 1effa578f12f79d7816e3543291f302f126cc1d2 (patch) | |
| tree | 14803b31b6817294d40d57446f6fa94c5ff3fe9a /src/video_core/vulkan_common | |
| parent | Merge pull request #9025 from FernandoS27/slava-ukrayini (diff) | |
| parent | vulkan_blitter: Fix pool allocation double free. (diff) | |
| download | yuzu-1effa578f12f79d7816e3543291f302f126cc1d2.tar.gz yuzu-1effa578f12f79d7816e3543291f302f126cc1d2.tar.xz yuzu-1effa578f12f79d7816e3543291f302f126cc1d2.zip | |
Merge pull request #8467 from FernandoS27/yfc-rel-1
Project yuzu Fried Chicken (Y.F.C.) Part 1
Diffstat (limited to 'src/video_core/vulkan_common')
| -rw-r--r-- | src/video_core/vulkan_common/vulkan_wrapper.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/src/video_core/vulkan_common/vulkan_wrapper.h b/src/video_core/vulkan_common/vulkan_wrapper.h index 795f16bfb..1b3f493bd 100644 --- a/src/video_core/vulkan_common/vulkan_wrapper.h +++ b/src/video_core/vulkan_common/vulkan_wrapper.h | |||
| @@ -519,9 +519,7 @@ public: | |||
| 519 | dld{rhs.dld} {} | 519 | dld{rhs.dld} {} |
| 520 | 520 | ||
| 521 | /// Assign an allocation transfering ownership from another allocation. | 521 | /// Assign an allocation transfering ownership from another allocation. |
| 522 | /// Releases any previously held allocation. | ||
| 523 | PoolAllocations& operator=(PoolAllocations&& rhs) noexcept { | 522 | PoolAllocations& operator=(PoolAllocations&& rhs) noexcept { |
| 524 | Release(); | ||
| 525 | allocations = std::move(rhs.allocations); | 523 | allocations = std::move(rhs.allocations); |
| 526 | num = rhs.num; | 524 | num = rhs.num; |
| 527 | device = rhs.device; | 525 | device = rhs.device; |
| @@ -530,11 +528,6 @@ public: | |||
| 530 | return *this; | 528 | return *this; |
| 531 | } | 529 | } |
| 532 | 530 | ||
| 533 | /// Destroys any held allocation. | ||
| 534 | ~PoolAllocations() { | ||
| 535 | Release(); | ||
| 536 | } | ||
| 537 | |||
| 538 | /// Returns the number of allocations. | 531 | /// Returns the number of allocations. |
| 539 | std::size_t size() const noexcept { | 532 | std::size_t size() const noexcept { |
| 540 | return num; | 533 | return num; |
| @@ -557,19 +550,6 @@ public: | |||
| 557 | } | 550 | } |
| 558 | 551 | ||
| 559 | private: | 552 | private: |
| 560 | /// Destroys the held allocations if they exist. | ||
| 561 | void Release() noexcept { | ||
| 562 | if (!allocations) { | ||
| 563 | return; | ||
| 564 | } | ||
| 565 | const Span<AllocationType> span(allocations.get(), num); | ||
| 566 | const VkResult result = Free(device, pool, span, *dld); | ||
| 567 | // There's no way to report errors from a destructor. | ||
| 568 | if (result != VK_SUCCESS) { | ||
| 569 | std::terminate(); | ||
| 570 | } | ||
| 571 | } | ||
| 572 | |||
| 573 | std::unique_ptr<AllocationType[]> allocations; | 553 | std::unique_ptr<AllocationType[]> allocations; |
| 574 | std::size_t num = 0; | 554 | std::size_t num = 0; |
| 575 | VkDevice device = nullptr; | 555 | VkDevice device = nullptr; |