eden-emu/eden
24
3
Fork 15
Code Issues 138 Pull requests 56 Projects 1 Releases Packages Wiki Activity Actions

[cmake] enable clang-cl and WoA builds #348

Merged
crueter merged 31 commits from liz-clang-cl-cmake into master 2025-09-09 20:47:51 +02:00
Conversation 9 Commits 31 Files changed 276 +20 -15
2 changed files with 20 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 95672fdd40 - Show all commits

22
externals/sse2neon/sse2neon.h vendored
View file

@ -183,7 +183,7 @@
} }
/* Compiler barrier */ /* Compiler barrier */
#if defined(_MSC_VER) #if defined(_MSC_VER) && !defined(__clang__)
#define SSE2NEON_BARRIER() _ReadWriteBarrier() #define SSE2NEON_BARRIER() _ReadWriteBarrier()
#else #else
#define SSE2NEON_BARRIER() \ #define SSE2NEON_BARRIER() \
@ -859,7 +859,7 @@ FORCE_INLINE uint64x2_t _sse2neon_vmull_p64(uint64x1_t _a, uint64x1_t _b)
{ {
poly64_t a = vget_lane_p64(vreinterpret_p64_u64(_a), 0); poly64_t a = vget_lane_p64(vreinterpret_p64_u64(_a), 0);
poly64_t b = vget_lane_p64(vreinterpret_p64_u64(_b), 0); poly64_t b = vget_lane_p64(vreinterpret_p64_u64(_b), 0);
#if defined(_MSC_VER) #if defined(_MSC_VER) && !defined(__clang__)
__n64 a1 = {a}, b1 = {b}; __n64 a1 = {a}, b1 = {b};
return vreinterpretq_u64_p128(vmull_p64(a1, b1)); return vreinterpretq_u64_p128(vmull_p64(a1, b1));
#else #else
@ -1770,7 +1770,7 @@ FORCE_INLINE void _mm_free(void *addr)
FORCE_INLINE uint64_t _sse2neon_get_fpcr(void) FORCE_INLINE uint64_t _sse2neon_get_fpcr(void)
{ {
uint64_t value; uint64_t value;
#if defined(_MSC_VER) #if defined(_MSC_VER) && !defined(__clang__)
value = _ReadStatusReg(ARM64_FPCR); value = _ReadStatusReg(ARM64_FPCR);
#else #else
__asm__ __volatile__("mrs %0, FPCR" : "=r"(value)); /* read */ __asm__ __volatile__("mrs %0, FPCR" : "=r"(value)); /* read */
@ -1780,7 +1780,7 @@ FORCE_INLINE uint64_t _sse2neon_get_fpcr(void)
FORCE_INLINE void _sse2neon_set_fpcr(uint64_t value) FORCE_INLINE void _sse2neon_set_fpcr(uint64_t value)
{ {
#if defined(_MSC_VER) #if defined(_MSC_VER) && !defined(__clang__)
_WriteStatusReg(ARM64_FPCR, value); _WriteStatusReg(ARM64_FPCR, value);
#else #else
__asm__ __volatile__("msr FPCR, %0" ::"r"(value)); /* write */ __asm__ __volatile__("msr FPCR, %0" ::"r"(value)); /* write */
@ -2249,7 +2249,7 @@ FORCE_INLINE __m128 _mm_or_ps(__m128 a, __m128 b)
FORCE_INLINE void _mm_prefetch(char const *p, int i) FORCE_INLINE void _mm_prefetch(char const *p, int i)
{ {
(void) i; (void) i;
#if defined(_MSC_VER) #if defined(_MSC_VER) && !defined(__clang__)
switch (i) { switch (i) {
case _MM_HINT_NTA: case _MM_HINT_NTA:
__prefetch2(p, 1); __prefetch2(p, 1);
@ -4820,7 +4820,7 @@ FORCE_INLINE __m128i _mm_packus_epi16(const __m128i a, const __m128i b)
// https://www.intel.com/content/www/us/en/docs/intrinsics-guide/index.html#text=_mm_pause // https://www.intel.com/content/www/us/en/docs/intrinsics-guide/index.html#text=_mm_pause
FORCE_INLINE void _mm_pause(void) FORCE_INLINE void _mm_pause(void)
{ {
#if defined(_MSC_VER) #if defined(_MSC_VER) && !defined(__clang__)
__isb(_ARM64_BARRIER_SY); __isb(_ARM64_BARRIER_SY);
#else #else
__asm__ __volatile__("isb\n"); __asm__ __volatile__("isb\n");
@ -5716,7 +5716,7 @@ FORCE_INLINE __m128d _mm_undefined_pd(void)
#pragma GCC diagnostic ignored "-Wuninitialized" #pragma GCC diagnostic ignored "-Wuninitialized"
#endif #endif
__m128d a; __m128d a;
#if defined(_MSC_VER) #if defined(_MSC_VER) && !defined(__clang__)
a = _mm_setzero_pd(); a = _mm_setzero_pd();
#endif #endif
return a; return a;
@ -8130,7 +8130,7 @@ FORCE_INLINE int _sse2neon_sido_negative(int res, int lb, int imm8, int bound)
FORCE_INLINE int _sse2neon_clz(unsigned int x) FORCE_INLINE int _sse2neon_clz(unsigned int x)
{ {
#ifdef _MSC_VER #if defined(_MSC_VER) && !defined(__clang__)
unsigned long cnt = 0; unsigned long cnt = 0;
if (_BitScanReverse(&cnt, x)) if (_BitScanReverse(&cnt, x))
return 31 - cnt; return 31 - cnt;
@ -8142,7 +8142,7 @@ FORCE_INLINE int _sse2neon_clz(unsigned int x)
FORCE_INLINE int _sse2neon_ctz(unsigned int x) FORCE_INLINE int _sse2neon_ctz(unsigned int x)
{ {
#ifdef _MSC_VER #if defined(_MSC_VER) && !defined(__clang__)
unsigned long cnt = 0; unsigned long cnt = 0;
if (_BitScanForward(&cnt, x)) if (_BitScanForward(&cnt, x))
return cnt; return cnt;
@ -9058,7 +9058,7 @@ FORCE_INLINE __m128i _mm_aeskeygenassist_si128(__m128i a, const int rcon)
// AESE does ShiftRows and SubBytes on A // AESE does ShiftRows and SubBytes on A
uint8x16_t u8 = vaeseq_u8(vreinterpretq_u8_m128i(a), vdupq_n_u8(0)); uint8x16_t u8 = vaeseq_u8(vreinterpretq_u8_m128i(a), vdupq_n_u8(0));
#ifndef _MSC_VER #if !defined(_MSC_VER) || defined(__clang__)
uint8x16_t dest = { uint8x16_t dest = {
// Undo ShiftRows step from AESE and extract X1 and X3 // Undo ShiftRows step from AESE and extract X1 and X3
u8[0x4], u8[0x1], u8[0xE], u8[0xB], // SubBytes(X1) u8[0x4], u8[0x1], u8[0xE], u8[0xB], // SubBytes(X1)
@ -9245,7 +9245,7 @@ FORCE_INLINE uint64_t _rdtsc(void)
* bits wide and it is attributed with the flag 'cap_user_time_short' * bits wide and it is attributed with the flag 'cap_user_time_short'
* is true. * is true.
*/ */
#if defined(_MSC_VER) #if defined(_MSC_VER) && !defined(__clang__)
val = _ReadStatusReg(ARM64_SYSREG(3, 3, 14, 0, 2)); val = _ReadStatusReg(ARM64_SYSREG(3, 3, 14, 0, 2));
#else #else
__asm__ __volatile__("mrs %0, cntvct_el0" : "=r"(val)); __asm__ __volatile__("mrs %0, cntvct_el0" : "=r"(val));

13
src/core/tools/renderdoc.cpp
View file

@ -1,3 +1,6 @@
// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
@ -18,10 +21,12 @@ namespace Tools {
RenderdocAPI::RenderdocAPI() { RenderdocAPI::RenderdocAPI() {
#ifdef WIN32 #ifdef WIN32
if (HMODULE mod = GetModuleHandleA("renderdoc.dll")) { if (HMODULE mod = GetModuleHandleA("renderdoc.dll")) {
const auto RENDERDOC_GetAPI = void* proc = reinterpret_cast<void*>(GetProcAddress(mod, "RENDERDOC_GetAPI"));
reinterpret_cast<pRENDERDOC_GetAPI>(GetProcAddress(mod, "RENDERDOC_GetAPI")); if (proc) {
const s32 ret = RENDERDOC_GetAPI(eRENDERDOC_API_Version_1_6_0, (void**)&rdoc_api); const auto RENDERDOC_GetAPI = reinterpret_cast<pRENDERDOC_GetAPI>(proc);
ASSERT(ret == 1); const s32 ret = RENDERDOC_GetAPI(eRENDERDOC_API_Version_1_6_0, (void**)&rdoc_api);
ASSERT(ret == 1);
}
} }
#else #else
#ifdef ANDROID #ifdef ANDROID