mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-09-29 15:31:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

vk: Avoid multimap when handling image views

Browse Source
This commit is contained in:
kd-11 2022-05-15 14:54:41 +03:00 committed by kd-11
parent e1b95913ea
commit 360fdca5ac
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
rpcs3/Emu/RSX/VK/vkutils/image.cpp
View File

@ -391,13 +391,12 @@ namespace vk
}
}
auto found = views.equal_range(remap_encoding);
for (auto It = found.first; It != found.second; ++It)
const auto storage_key = remap_encoding | (mask << 16);
auto found = views.find(storage_key);
if (found != views.end() &&
found->second->info.subresourceRange.aspectMask & mask)
{
if (It->second->info.subresourceRange.aspectMask & mask)
{
return It->second.get();
}
return found->second.get();
}
VkComponentMapping real_mapping;
@ -423,7 +422,7 @@ namespace vk
auto view = std::make_unique<vk::image_view>(*g_render_device, this, VK_IMAGE_VIEW_TYPE_MAX_ENUM, real_mapping, range);
auto result = view.get();
views.emplace(remap_encoding, std::move(view));
views.emplace(storage_key, std::move(view));
return result;
}

2
rpcs3/Emu/RSX/VK/vkutils/image.h
View File

@ -124,7 +124,7 @@ namespace vk
class viewable_image : public image
{
protected:
std::unordered_multimap<u32, std::unique_ptr<vk::image_view>> views;
std::unordered_map<u32, std::unique_ptr<vk::image_view>> views;
viewable_image* clone();
public: