summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatric Stout <truebrain@openttd.org>2021-05-30 10:40:03 +0200
committerGitHub <noreply@github.com>2021-05-30 10:40:03 +0200
commitbcd7a7aafe3d63117be74580298dcb20a53e4121 (patch)
treef0471f1c24b8f60ff2cde5af6e8d0e63330832e4
parent8c273ed598f59e18acb1c0bcbc9bc34beb307ecb (diff)
downloadopenttd-bcd7a7aafe3d63117be74580298dcb20a53e4121.tar.xz
Codechange: rename _SQ64 into POINTER_IS_64BIT (#9313)
-rw-r--r--CMakeLists.txt2
-rw-r--r--src/blitter/32bpp_anim_sse4.cpp4
-rw-r--r--src/blitter/32bpp_sse_func.hpp4
-rw-r--r--src/crashlog.cpp2
-rw-r--r--src/os/macosx/osx_stdafx.h4
-rw-r--r--src/viewport_sprite_sorter_sse4.cpp2
6 files changed, 9 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c8c6f040e..d060ffbbf 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -370,7 +370,7 @@ if(WIN32)
endif()
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
- add_definitions(-D_SQ64)
+ add_definitions(-DPOINTER_IS_64BIT)
endif()
include(CreateRegression)
diff --git a/src/blitter/32bpp_anim_sse4.cpp b/src/blitter/32bpp_anim_sse4.cpp
index c6213ce30..adfe62528 100644
--- a/src/blitter/32bpp_anim_sse4.cpp
+++ b/src/blitter/32bpp_anim_sse4.cpp
@@ -198,7 +198,7 @@ bmno_full_transparency:
m_colour = r == 0 ? m_colour : cmap; \
m_colour = m != 0 ? m_colour : srcm; \
}
-#ifdef _SQ64
+#ifdef POINTER_IS_64BIT
uint64 srcs = _mm_cvtsi128_si64(srcABCD);
uint64 dsts;
if (animated) dsts = _mm_cvtsi128_si64(dstABCD);
@@ -380,7 +380,7 @@ bm_normal:
else Draw<BM_NORMAL, RM_WITH_SKIP, BT_ODD, true, true>(bp, zoom);
}
} else {
-#ifdef _SQ64
+#ifdef POINTER_IS_64BIT
if (sprite_flags & SF_TRANSLUCENT) {
if (sprite_flags & SF_NO_ANIM) Draw<BM_NORMAL, RM_WITH_MARGIN, BT_NONE, true, false>(bp, zoom);
else Draw<BM_NORMAL, RM_WITH_MARGIN, BT_NONE, true, true>(bp, zoom);
diff --git a/src/blitter/32bpp_sse_func.hpp b/src/blitter/32bpp_sse_func.hpp
index 083839b95..d6e12af61 100644
--- a/src/blitter/32bpp_sse_func.hpp
+++ b/src/blitter/32bpp_sse_func.hpp
@@ -34,7 +34,7 @@ static inline void InsertSecondUint32(const uint32 value, __m128i &into)
static inline void LoadUint64(const uint64 value, __m128i &into)
{
-#ifdef _SQ64
+#ifdef POINTER_IS_64BIT
into = _mm_cvtsi64_si128(value);
#else
#if (SSE_VERSION >= 4)
@@ -297,7 +297,7 @@ inline void Blitter_32bppSSE4::Draw(const Blitter::BlitterParams *bp, ZoomLevel
m_colour = r == 0 ? m_colour : cmap; \
m_colour = m != 0 ? m_colour : srcm; \
}
-#ifdef _SQ64
+#ifdef POINTER_IS_64BIT
uint64 srcs = _mm_cvtsi128_si64(srcABCD);
uint64 remapped_src = 0;
CMOV_REMAP(c0, 0, srcs, mvX2);
diff --git a/src/crashlog.cpp b/src/crashlog.cpp
index c69dddef8..b7c8c2bc4 100644
--- a/src/crashlog.cpp
+++ b/src/crashlog.cpp
@@ -126,7 +126,7 @@ char *CrashLog::LogOpenTTDVersion(char *buffer, const char *last) const
_openttd_revision,
_openttd_revision_modified,
_openttd_newgrf_version,
-#ifdef _SQ64
+#ifdef POINTER_IS_64BIT
64,
#else
32,
diff --git a/src/os/macosx/osx_stdafx.h b/src/os/macosx/osx_stdafx.h
index d90a19c5f..e147fcf74 100644
--- a/src/os/macosx/osx_stdafx.h
+++ b/src/os/macosx/osx_stdafx.h
@@ -73,8 +73,8 @@
#endif
/* Check for mismatching 'architectures' */
-#if !defined(STRGEN) && !defined(SETTINGSGEN) && ((defined(__LP64__) && !defined(_SQ64)) || (!defined(__LP64__) && defined(_SQ64)))
-# error "Compiling 64 bits without _SQ64 set! (or vice versa)"
+#if !defined(STRGEN) && !defined(SETTINGSGEN) && ((defined(__LP64__) && !defined(POINTER_IS_64BIT)) || (!defined(__LP64__) && defined(POINTER_IS_64BIT)))
+# error "Compiling 64 bits without POINTER_IS_64BIT set! (or vice versa)"
#endif
/* Name conflict */
diff --git a/src/viewport_sprite_sorter_sse4.cpp b/src/viewport_sprite_sorter_sse4.cpp
index f3747b89b..fc7eb49e4 100644
--- a/src/viewport_sprite_sorter_sse4.cpp
+++ b/src/viewport_sprite_sorter_sse4.cpp
@@ -19,7 +19,7 @@
#include "safeguards.h"
-#ifdef _SQ64
+#ifdef POINTER_IS_64BIT
static_assert((sizeof(ParentSpriteToDraw) % 16) == 0);
# define LOAD_128 _mm_load_si128
#else