Merge branch 'Vita3K:master' into master

backgamon · Jan 21, 2024 · f5b0717 · f5b0717
2 parents afd3393 + ed3e7e8
commit f5b0717
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/vita3k/renderer/src/transfer.cpp b/vita3k/renderer/src/transfer.cpp
@@ -30,8 +30,8 @@ namespace renderer {
 
 template <typename T, SceGxmTransferColorKeyMode mode, SceGxmTransferType src_type, SceGxmTransferType dst_type>
 static void perform_transfer_copy_impl(MemState &mem, const SceGxmTransferImage &src, const SceGxmTransferImage &dst, uint32_t key_value, uint32_t key_mask) {
-    T *restrict src_ptr = src.address.cast<T>().get(mem);
-    T *restrict dst_ptr = dst.address.cast<T>().get(mem);
+    T *__restrict__ src_ptr = src.address.cast<T>().get(mem);
+    T *__restrict__ dst_ptr = dst.address.cast<T>().get(mem);
 
     auto compute_offset = [&](uint32_t dx, uint32_t dy, const SceGxmTransferImage &img, SceGxmTransferType type) -> int32_t {
         const int32_t stride_pixel = img.stride / sizeof(T);

diff --git a/vita3k/util/include/util/keywords.h b/vita3k/util/include/util/keywords.h
@@ -18,7 +18,5 @@
 #pragma once
 
 #if defined(_MSC_VER)
-#define restrict __restrict
-#else
-#define restrict __restrict__
+#define __restrict__ __restrict
 #endif