VulkanDeviceAlloc: Memorytype per slab #11744
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@unknownbrackets I'm gonna go ahead and merge this, since I think it's pretty safe. Let me know what you think when you have a sec. |
| @@ -76,6 +77,8 @@ bool VulkanTexture::CreateDirect(VkCommandBuffer cmd, int w, int h, int numMips, | |||
| if (allocator_) { | |||
| offset_ = allocator_->Allocate(mem_reqs, &mem_, Tag()); | |||
| if (offset_ == VulkanDeviceAllocator::ALLOCATE_FAILED) { | |||
| vkDestroyImage(vulkan_->GetDevice(), image_, nullptr); | |||
There was a problem hiding this comment.
Destroy is called in the destructor which already does this. We should at least clear image_, but I'm personally not a big fan of repeating WET cleanup code in every error case, so I try to design things so they auto-cleanup and the code is easier to read.
-[Unknown]
There was a problem hiding this comment.
WET? Yeah I see your point, I'll clean it up.
There was a problem hiding this comment.
We Enjoy Typing. The opposite of DRY.
-[Unknown]
| @@ -89,6 +92,7 @@ bool VulkanTexture::CreateDirect(VkCommandBuffer cmd, int w, int h, int numMips, | |||
|
|
|||
| res = vkAllocateMemory(vulkan_->GetDevice(), &mem_alloc, NULL, &mem_); | |||
| if (res != VK_SUCCESS) { | |||
| ELOG("vkAllocateMemory failed: %s", VulkanResultToString(res)); | |||
| _assert_msg_(G3D, res != VK_ERROR_TOO_MANY_OBJECTS, "Too many Vulkan memory objects!"); | |||
| _assert_(res == VK_ERROR_OUT_OF_HOST_MEMORY || res == VK_ERROR_OUT_OF_DEVICE_MEMORY || res == VK_ERROR_TOO_MANY_OBJECTS); | |||
| vkDestroyImage(vulkan_->GetDevice(), image_, nullptr); | |||
There was a problem hiding this comment.
FWIW, this one is also not necessary but at least clears image_ so is fine.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See #11743 for the details. This fixes a wrong assumption we had about driver behavior.