mirror of https://github.com/OpenTTD/OpenTTD.git
Codechange: rename _SQ64 into POINTER_IS_64BIT (#9313)
This commit is contained in:
parent
8c273ed598
commit
bcd7a7aafe
|
@ -370,7 +370,7 @@ if(WIN32)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
|
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
|
||||||
add_definitions(-D_SQ64)
|
add_definitions(-DPOINTER_IS_64BIT)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
include(CreateRegression)
|
include(CreateRegression)
|
||||||
|
|
|
@ -198,7 +198,7 @@ bmno_full_transparency:
|
||||||
m_colour = r == 0 ? m_colour : cmap; \
|
m_colour = r == 0 ? m_colour : cmap; \
|
||||||
m_colour = m != 0 ? m_colour : srcm; \
|
m_colour = m != 0 ? m_colour : srcm; \
|
||||||
}
|
}
|
||||||
#ifdef _SQ64
|
#ifdef POINTER_IS_64BIT
|
||||||
uint64 srcs = _mm_cvtsi128_si64(srcABCD);
|
uint64 srcs = _mm_cvtsi128_si64(srcABCD);
|
||||||
uint64 dsts;
|
uint64 dsts;
|
||||||
if (animated) dsts = _mm_cvtsi128_si64(dstABCD);
|
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 Draw<BM_NORMAL, RM_WITH_SKIP, BT_ODD, true, true>(bp, zoom);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
#ifdef _SQ64
|
#ifdef POINTER_IS_64BIT
|
||||||
if (sprite_flags & SF_TRANSLUCENT) {
|
if (sprite_flags & SF_TRANSLUCENT) {
|
||||||
if (sprite_flags & SF_NO_ANIM) Draw<BM_NORMAL, RM_WITH_MARGIN, BT_NONE, true, false>(bp, zoom);
|
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);
|
else Draw<BM_NORMAL, RM_WITH_MARGIN, BT_NONE, true, true>(bp, zoom);
|
||||||
|
|
|
@ -34,7 +34,7 @@ static inline void InsertSecondUint32(const uint32 value, __m128i &into)
|
||||||
|
|
||||||
static inline void LoadUint64(const uint64 value, __m128i &into)
|
static inline void LoadUint64(const uint64 value, __m128i &into)
|
||||||
{
|
{
|
||||||
#ifdef _SQ64
|
#ifdef POINTER_IS_64BIT
|
||||||
into = _mm_cvtsi64_si128(value);
|
into = _mm_cvtsi64_si128(value);
|
||||||
#else
|
#else
|
||||||
#if (SSE_VERSION >= 4)
|
#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 = r == 0 ? m_colour : cmap; \
|
||||||
m_colour = m != 0 ? m_colour : srcm; \
|
m_colour = m != 0 ? m_colour : srcm; \
|
||||||
}
|
}
|
||||||
#ifdef _SQ64
|
#ifdef POINTER_IS_64BIT
|
||||||
uint64 srcs = _mm_cvtsi128_si64(srcABCD);
|
uint64 srcs = _mm_cvtsi128_si64(srcABCD);
|
||||||
uint64 remapped_src = 0;
|
uint64 remapped_src = 0;
|
||||||
CMOV_REMAP(c0, 0, srcs, mvX2);
|
CMOV_REMAP(c0, 0, srcs, mvX2);
|
||||||
|
|
|
@ -126,7 +126,7 @@ char *CrashLog::LogOpenTTDVersion(char *buffer, const char *last) const
|
||||||
_openttd_revision,
|
_openttd_revision,
|
||||||
_openttd_revision_modified,
|
_openttd_revision_modified,
|
||||||
_openttd_newgrf_version,
|
_openttd_newgrf_version,
|
||||||
#ifdef _SQ64
|
#ifdef POINTER_IS_64BIT
|
||||||
64,
|
64,
|
||||||
#else
|
#else
|
||||||
32,
|
32,
|
||||||
|
|
|
@ -73,8 +73,8 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Check for mismatching 'architectures' */
|
/* Check for mismatching 'architectures' */
|
||||||
#if !defined(STRGEN) && !defined(SETTINGSGEN) && ((defined(__LP64__) && !defined(_SQ64)) || (!defined(__LP64__) && defined(_SQ64)))
|
#if !defined(STRGEN) && !defined(SETTINGSGEN) && ((defined(__LP64__) && !defined(POINTER_IS_64BIT)) || (!defined(__LP64__) && defined(POINTER_IS_64BIT)))
|
||||||
# error "Compiling 64 bits without _SQ64 set! (or vice versa)"
|
# error "Compiling 64 bits without POINTER_IS_64BIT set! (or vice versa)"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Name conflict */
|
/* Name conflict */
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
|
|
||||||
#include "safeguards.h"
|
#include "safeguards.h"
|
||||||
|
|
||||||
#ifdef _SQ64
|
#ifdef POINTER_IS_64BIT
|
||||||
static_assert((sizeof(ParentSpriteToDraw) % 16) == 0);
|
static_assert((sizeof(ParentSpriteToDraw) % 16) == 0);
|
||||||
# define LOAD_128 _mm_load_si128
|
# define LOAD_128 _mm_load_si128
|
||||||
#else
|
#else
|
||||||
|
|
Loading…
Reference in New Issue