From 564c903fbd4e64d5fc5008ae210dd814d68ca41e Mon Sep 17 00:00:00 2001 From: kd-11 Date: Sat, 19 Apr 2025 00:13:21 +0300 Subject: [PATCH] rsx: Fix arm64 build --- rpcs3/Emu/RSX/Common/BufferUtils.cpp | 8 ++++++++ rpcs3/Emu/RSX/VK/vkutils/data_heap.h | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/rpcs3/Emu/RSX/Common/BufferUtils.cpp b/rpcs3/Emu/RSX/Common/BufferUtils.cpp index 4c668290af..ed86efcc7a 100644 --- a/rpcs3/Emu/RSX/Common/BufferUtils.cpp +++ b/rpcs3/Emu/RSX/Common/BufferUtils.cpp @@ -6,6 +6,14 @@ #include "util/v128.hpp" #include "util/simd.hpp" +#if defined(ARCH_ARM64) +#if !defined(_MSC_VER) +#pragma GCC diagnostic ignored "-Wstrict-aliasing" +#endif +#undef FORCE_INLINE +#include "Emu/CPU/sse2neon.h" +#endif + #if !defined(_MSC_VER) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wold-style-cast" diff --git a/rpcs3/Emu/RSX/VK/vkutils/data_heap.h b/rpcs3/Emu/RSX/VK/vkutils/data_heap.h index d849cf65d2..8d8c6e3be3 100644 --- a/rpcs3/Emu/RSX/VK/vkutils/data_heap.h +++ b/rpcs3/Emu/RSX/VK/vkutils/data_heap.h @@ -45,7 +45,7 @@ namespace vk { const auto size_bytes = count * sizeof(T); const auto addr = alloc(size_bytes); - return { addr, reinterpret_cast( map(addr, size_bytes)) }; + return { addr, reinterpret_cast(map(addr, size_bytes)) }; } void sync(const vk::command_buffer& cmd);