diff --git a/rpcs3/Emu/RSX/Common/TextureUtils.h b/rpcs3/Emu/RSX/Common/TextureUtils.h index d8614df041..9af137acc6 100644 --- a/rpcs3/Emu/RSX/Common/TextureUtils.h +++ b/rpcs3/Emu/RSX/Common/TextureUtils.h @@ -106,7 +106,7 @@ namespace rsx // Defines how the underlying PS3-visible memory backed by a texture is accessed 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 { RSX_FORMAT_CLASS_UNDEFINED = 0, diff --git a/rpcs3/Emu/RSX/VK/VKGSRender.h b/rpcs3/Emu/RSX/VK/VKGSRender.h index b144b7a443..0d104b4540 100644 --- a/rpcs3/Emu/RSX/VK/VKGSRender.h +++ b/rpcs3/Emu/RSX/VK/VKGSRender.h @@ -335,6 +335,8 @@ namespace vk }; } +using namespace vk::vmm_allocation_pool_; // clang workaround. + class VKGSRender : public GSRender, public ::rsx::reports::ZCULL_control { private: @@ -365,8 +367,6 @@ private: deadlock = 2 }; - using enum vk::vmm_allocation_pool; - private: VKFragmentProgram m_fragment_prog; VKVertexProgram m_vertex_prog; diff --git a/rpcs3/Emu/RSX/VK/vkutils/memory.h b/rpcs3/Emu/RSX/VK/vkutils/memory.h index 02dadb0c6b..830c4c7c57 100644 --- a/rpcs3/Emu/RSX/VK/vkutils/memory.h +++ b/rpcs3/Emu/RSX/VK/vkutils/memory.h @@ -8,15 +8,20 @@ namespace vk { - enum vmm_allocation_pool + namespace vmm_allocation_pool_ // Workaround for clang < 13 not supporting enum imports { - VMM_ALLOCATION_POOL_UNDEFINED = 0, - VMM_ALLOCATION_POOL_SYSTEM, - VMM_ALLOCATION_POOL_SURFACE_CACHE, - VMM_ALLOCATION_POOL_TEXTURE_CACHE, - VMM_ALLOCATION_POOL_SWAPCHAIN, - VMM_ALLOCATION_POOL_SCRATCH, - }; + enum vmm_allocation_pool + { + VMM_ALLOCATION_POOL_UNDEFINED = 0, + VMM_ALLOCATION_POOL_SYSTEM, + VMM_ALLOCATION_POOL_SURFACE_CACHE, + VMM_ALLOCATION_POOL_TEXTURE_CACHE, + VMM_ALLOCATION_POOL_SWAPCHAIN, + VMM_ALLOCATION_POOL_SCRATCH, + }; + } + + using namespace vk::vmm_allocation_pool_; class mem_allocator_base {