diff options
| author | Lioncash <mathew1800@gmail.com> | 2018-06-09 11:47:01 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2018-06-09 12:20:25 -0400 |
| commit | 3f210836ad330bcb6bca5dee73c5c542ac18af32 (patch) | |
| tree | 20ff231e6989d87a23411522fc6cd746d0f51711 /Source/Core/VideoCommon/VertexLoader_Normal.cpp | |
| parent | 03414e8e848fd99e2ea83f4466a1cf34c2ad6807 (diff) | |
Compiler: Rename __forceinline define to DOLPHIN_FORCE_INLINE
This is much better as prefixed double underscores are reserved for the
implementation when it comes to identifiers. Another reason its better,
is that, on Windows, where __forceinline is a compiler built-in, with
the previous define, header inclusion software that detects unnecessary
includes will erroneously flag usages of Compiler.h as unnecessary
(despite being necessary on other platforms). So we define a macro
that's used by Windows and other platforms to ensure this doesn't
happen.
Diffstat (limited to 'Source/Core/VideoCommon/VertexLoader_Normal.cpp')
| -rw-r--r-- | Source/Core/VideoCommon/VertexLoader_Normal.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/VideoCommon/VertexLoader_Normal.cpp b/Source/Core/VideoCommon/VertexLoader_Normal.cpp index 2676bc9ba4..b746f4f5d0 100644 --- a/Source/Core/VideoCommon/VertexLoader_Normal.cpp +++ b/Source/Core/VideoCommon/VertexLoader_Normal.cpp @@ -26,7 +26,7 @@ VertexLoader_Normal::Set VertexLoader_Normal::m_Table[NUM_NRM_TYPE][NUM_NRM_INDI namespace { template <typename T> -__forceinline float FracAdjust(T val) +DOLPHIN_FORCE_INLINE float FracAdjust(T val) { // auto const S8FRAC = 1.f / (1u << 6); // auto const U8FRAC = 1.f / (1u << 7); @@ -38,13 +38,13 @@ __forceinline float FracAdjust(T val) } template <> -__forceinline float FracAdjust(float val) +DOLPHIN_FORCE_INLINE float FracAdjust(float val) { return val; } template <typename T, int N> -__forceinline void ReadIndirect(const T* data) +DOLPHIN_FORCE_INLINE void ReadIndirect(const T* data) { static_assert(3 == N || 9 == N, "N is only sane as 3 or 9!"); DataReader dst(g_vertex_manager_write_ptr, nullptr); @@ -72,7 +72,7 @@ struct Normal_Direct }; template <typename I, typename T, int N, int Offset> -__forceinline void Normal_Index_Offset() +DOLPHIN_FORCE_INLINE void Normal_Index_Offset() { static_assert(std::is_unsigned<I>::value, "Only unsigned I is sane!"); |
