piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

Compiler: Rename __forceinline define to DOLPHIN_FORCE_INLINE

Browse Source 
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.
This commit is contained in:
Lioncash
2018-06-09 11:47:01 -04:00
parent 03414e8e84
commit 3f210836ad
8 changed files with 23 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Core/VideoCommon/VertexLoaderUtils.h
View File

@ -12,20 +12,20 @@
extern u8* g_video_buffer_read_ptr;
extern u8* g_vertex_manager_write_ptr;
__forceinline void DataSkip(u32 skip)
DOLPHIN_FORCE_INLINE void DataSkip(u32 skip)
{
g_video_buffer_read_ptr += skip;
}
// probably unnecessary
template <int count>
__forceinline void DataSkip()
DOLPHIN_FORCE_INLINE void DataSkip()
{
g_video_buffer_read_ptr += count;
}
template <typename T>
__forceinline T DataPeek(int _uOffset, u8* bufp = g_video_buffer_read_ptr)
DOLPHIN_FORCE_INLINE T DataPeek(int _uOffset, u8* bufp = g_video_buffer_read_ptr)
{
T result;
std::memcpy(&result, &bufp[_uOffset], sizeof(T));
@ -33,14 +33,14 @@ __forceinline T DataPeek(int _uOffset, u8* bufp = g_video_buffer_read_ptr)
}
template <typename T>
__forceinline T DataRead(u8** bufp = &g_video_buffer_read_ptr)
DOLPHIN_FORCE_INLINE T DataRead(u8** bufp = &g_video_buffer_read_ptr)
{
auto const result = DataPeek<T>(0, *bufp);
*bufp += sizeof(T);
return result;
}
__forceinline u32 DataReadU32Unswapped()
DOLPHIN_FORCE_INLINE u32 DataReadU32Unswapped()
{
u32 result;
std::memcpy(&result, g_video_buffer_read_ptr, sizeof(u32));
@ -48,13 +48,13 @@ __forceinline u32 DataReadU32Unswapped()
return result;
}
__forceinline u8* DataGetPosition()
DOLPHIN_FORCE_INLINE u8* DataGetPosition()
{
return g_video_buffer_read_ptr;
}
template <typename T>
__forceinline void DataWrite(T data)
DOLPHIN_FORCE_INLINE void DataWrite(T data)
{
std::memcpy(g_vertex_manager_write_ptr, &data, sizeof(T));
g_vertex_manager_write_ptr += sizeof(T);