archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-12 17:58:37 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

vk: Fix comparison between composite memory types

Browse source
This commit is contained in:
kd-11 2021-07-26 23:07:34 +03:00 • committed by kd-11
parent a4cd9e022a
commit e5029c532b
2 changed files with 27 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

26
rpcs3/Emu/RSX/VK/vkutils/memory.cpp
View file

@ -47,6 +47,32 @@ namespace vk
memory_type_info::operator bool() const memory_type_info::operator bool() const
{ {
return !type_ids.empty(); return !type_ids.empty();
}
bool memory_type_info::operator == (const memory_type_info& other) const
{
if (type_ids.size() != other.type_ids.size())
{
return false;
}
switch (type_ids.size())
{
case 1:
return type_ids[0] == other.type_ids[0];
case 2:
return ((type_ids[0] == other.type_ids[0] && type_ids[1] == other.type_ids[1]) ||
(type_ids[0] == other.type_ids[1] && type_ids[1] == other.type_ids[0]));
default:
for (const auto& id : other.type_ids)
{
if (std::find(type_ids.begin(), type_ids.end(), id) == type_ids.end())
{
return false;
}
}
return true;
}
} }
memory_type_info memory_type_info::get(const render_device& dev, u32 access_flags, u32 type_mask) const memory_type_info memory_type_info::get(const render_device& dev, u32 access_flags, u32 type_mask) const

1
rpcs3/Emu/RSX/VK/vkutils/memory.h
View file

@ -42,6 +42,7 @@ namespace vk
size_t count() const; size_t count() const;
operator bool() const; operator bool() const;
bool operator == (const memory_type_info& other) const;
memory_type_info get(const render_device& dev, u32 access_flags, u32 type_mask) const; memory_type_info get(const render_device& dev, u32 access_flags, u32 type_mask) const;