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

Clang workaround for c++20 non-compliance

Browse source
This commit is contained in:
kd-11 2021-07-14 22:36:29 +03:00 • committed by kd-11
parent 974a3c8807
commit aaac4c1bde
3 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rpcs3/Emu/RSX/Common/TextureUtils.h
View file

@ -106,7 +106,7 @@ namespace rsx
// Defines how the underlying PS3-visible memory backed by a texture is accessed // Defines how the underlying PS3-visible memory backed by a texture is accessed
namespace format_class_ namespace format_class_
{ {
// TODO: Remove when enum import is supported by GCC // TODO: Remove when enum import is supported by clang
enum format_class : u8 enum format_class : u8
{ {
RSX_FORMAT_CLASS_UNDEFINED = 0, RSX_FORMAT_CLASS_UNDEFINED = 0,

4
rpcs3/Emu/RSX/VK/VKGSRender.h
View file

@ -335,6 +335,8 @@ namespace vk
}; };
} }
using namespace vk::vmm_allocation_pool_; // clang workaround.
class VKGSRender : public GSRender, public ::rsx::reports::ZCULL_control class VKGSRender : public GSRender, public ::rsx::reports::ZCULL_control
{ {
private: private:
@ -365,8 +367,6 @@ private:
deadlock = 2 deadlock = 2
}; };
using enum vk::vmm_allocation_pool;
private: private:
VKFragmentProgram m_fragment_prog; VKFragmentProgram m_fragment_prog;
VKVertexProgram m_vertex_prog; VKVertexProgram m_vertex_prog;

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

@ -7,6 +7,8 @@
#include "3rdparty/GPUOpen/include/vk_mem_alloc.h" #include "3rdparty/GPUOpen/include/vk_mem_alloc.h"
namespace vk namespace vk
{
namespace vmm_allocation_pool_ // Workaround for clang < 13 not supporting enum imports
{ {
enum vmm_allocation_pool enum vmm_allocation_pool
{ {
@ -17,6 +19,9 @@ namespace vk
VMM_ALLOCATION_POOL_SWAPCHAIN, VMM_ALLOCATION_POOL_SWAPCHAIN,
VMM_ALLOCATION_POOL_SCRATCH, VMM_ALLOCATION_POOL_SCRATCH,
}; };
}
using namespace vk::vmm_allocation_pool_;
class mem_allocator_base class mem_allocator_base
{ {