Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Vk validation fixes, plus PowerVR swapchain hack #11747

Merged
merged 6 commits into from
Jan 26, 2019
Merged

Vk validation fixes, plus PowerVR swapchain hack #11747

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
add5e3c
DeleteDirRecursively: Don't leak the find handle on failure (win32)
hrydgard Jan 25, 2019
c38c546
Fixes for issues found by Vulkan validation layers, including a commo…
hrydgard Jan 25, 2019
3fd216a
Better handling of swap chain size, add PowerVR hack. Fixes #11743
hrydgard Jan 25, 2019
7ccf235
Fix SDL build
hrydgard Jan 26, 2019
68f3917
Remove some unnecessary vkDestroyImage calls.
hrydgard Jan 26, 2019
6f19964
Also buildfix for libretro
hrydgard Jan 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions Common/Vulkan/VulkanImage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,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);
ELOG("Image memory allocation failed (mem_reqs.size = %d)", (int)mem_reqs.size);
return false;
}
// Destructor will take care of the image.
return false;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wait, shouldn't this be inside the ALLOCATE_FAILED if?

-[Unknown]

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops what happened here.. sloppy editing. I'll fix soon.

} else {
VkMemoryAllocateInfo mem_alloc{ VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO };
mem_alloc.memoryTypeIndex = 0;
Expand All @@ -95,8 +92,6 @@ bool VulkanTexture::CreateDirect(VkCommandBuffer cmd, int w, int h, int numMips,
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);
image_ = VK_NULL_HANDLE;
return false;
}

Expand Down