diff --git a/renderdoc/os/os_specific.h b/renderdoc/os/os_specific.h index b70feae00..b3961241a 100644 --- a/renderdoc/os/os_specific.h +++ b/renderdoc/os/os_specific.h @@ -204,7 +204,7 @@ int32_t Dec32(volatile int32_t *i); int64_t Inc64(volatile int64_t *i); int64_t Dec64(volatile int64_t *i); int64_t ExchAdd64(volatile int64_t *i, int64_t a); -int32_t CmpExch32(volatile int32_t *dest, int32_t exch, int32_t comp); +int32_t CmpExch32(volatile int32_t *dest, int32_t oldVal, int32_t newVal); }; namespace Callstack diff --git a/renderdoc/os/posix/posix_threading.cpp b/renderdoc/os/posix/posix_threading.cpp index bc915391b..96c15f973 100644 --- a/renderdoc/os/posix/posix_threading.cpp +++ b/renderdoc/os/posix/posix_threading.cpp @@ -60,9 +60,9 @@ int64_t ExchAdd64(volatile int64_t *i, int64_t a) return __sync_add_and_fetch(i, int64_t(a)); } -int32_t CmpExch32(volatile int32_t *dest, int32_t exch, int32_t comp) +int32_t CmpExch32(volatile int32_t *dest, int32_t oldVal, int32_t newVal) { - return __sync_val_compare_and_swap(dest, comp, exch); + return __sync_val_compare_and_swap(dest, oldVal, newVal); } }; diff --git a/renderdoc/os/win32/win32_threading.cpp b/renderdoc/os/win32/win32_threading.cpp index 946be7192..451ed3a68 100644 --- a/renderdoc/os/win32/win32_threading.cpp +++ b/renderdoc/os/win32/win32_threading.cpp @@ -73,9 +73,9 @@ int64_t ExchAdd64(volatile int64_t *i, int64_t a) return (int64_t)InterlockedExchangeAdd64((volatile LONG64 *)i, a); } -int32_t CmpExch32(volatile int32_t *dest, int32_t exch, int32_t comp) +int32_t CmpExch32(volatile int32_t *dest, int32_t oldVal, int32_t newVal) { - return (int32_t)InterlockedCompareExchange((volatile LONG *)dest, exch, comp); + return (int32_t)InterlockedCompareExchange((volatile LONG *)dest, newVal, oldVal); } };