ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2629 from lioncash/vertexloader-ifdef 

VertexLoader: Remove the LOADERDECL define.
This commit is contained in:
flacs 2015-06-21 03:17:38 +02:00
parent 1003d08d81 619e333dcc
commit a702c4e01e
7 changed files with 51 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Core/VideoCommon/VertexLoader.cpp
View File

@ -22,7 +22,7 @@
u8* g_video_buffer_read_ptr;
u8* g_vertex_manager_write_ptr;
static void LOADERDECL PosMtx_ReadDirect_UByte(VertexLoader* loader)
static void PosMtx_ReadDirect_UByte(VertexLoader* loader)
{
u32 posmtx = DataReadU8() & 0x3f;
if (loader->m_counter < 3)
@ -31,7 +31,7 @@ static void LOADERDECL PosMtx_ReadDirect_UByte(VertexLoader* loader)
PRIM_LOG("posmtx: %d, ", posmtx);
}
static void LOADERDECL TexMtx_ReadDirect_UByte(VertexLoader* loader)
static void TexMtx_ReadDirect_UByte(VertexLoader* loader)
{
loader->m_curtexmtx[loader->m_texmtxread] = DataReadU8() & 0x3f;
@ -39,25 +39,25 @@ static void LOADERDECL TexMtx_ReadDirect_UByte(VertexLoader* loader)
loader->m_texmtxread++;
}
static void LOADERDECL TexMtx_Write_Float(VertexLoader* loader)
static void TexMtx_Write_Float(VertexLoader* loader)
{
DataWrite(float(loader->m_curtexmtx[loader->m_texmtxwrite++]));
}
static void LOADERDECL TexMtx_Write_Float2(VertexLoader* loader)
static void TexMtx_Write_Float2(VertexLoader* loader)
{
DataWrite(0.f);
DataWrite(float(loader->m_curtexmtx[loader->m_texmtxwrite++]));
}
static void LOADERDECL TexMtx_Write_Float3(VertexLoader* loader)
static void TexMtx_Write_Float3(VertexLoader* loader)
{
DataWrite(0.f);
DataWrite(0.f);
DataWrite(float(loader->m_curtexmtx[loader->m_texmtxwrite++]));
}
static void LOADERDECL SkipVertex(VertexLoader* loader)
static void SkipVertex(VertexLoader* loader)
{
if (loader->m_vertexSkip)
{

7
Source/Core/VideoCommon/VertexLoader.h
View File

@ -18,14 +18,9 @@
#include "VideoCommon/VertexLoaderBase.h"
#include "VideoCommon/VertexLoaderUtils.h"
#ifdef WIN32
#define LOADERDECL __cdecl
#else
#define LOADERDECL
#endif
class VertexLoader;
typedef void (LOADERDECL *TPipelineFunction)(VertexLoader* loader);
typedef void (*TPipelineFunction)(VertexLoader* loader);
class VertexLoader : public VertexLoaderBase
{

36
Source/Core/VideoCommon/VertexLoader_Color.cpp
View File

@ -67,32 +67,32 @@ __forceinline u32 _Read32(const u8 *addr)
}
void LOADERDECL Color_ReadDirect_24b_888(VertexLoader* loader)
void Color_ReadDirect_24b_888(VertexLoader* loader)
{
_SetCol(loader, _Read24(DataGetPosition()));
DataSkip(3);
}
void LOADERDECL Color_ReadDirect_32b_888x(VertexLoader* loader)
void Color_ReadDirect_32b_888x(VertexLoader* loader)
{
_SetCol(loader, _Read24(DataGetPosition()));
DataSkip(4);
}
void LOADERDECL Color_ReadDirect_16b_565(VertexLoader* loader)
void Color_ReadDirect_16b_565(VertexLoader* loader)
{
_SetCol565(loader, DataReadU16());
}
void LOADERDECL Color_ReadDirect_16b_4444(VertexLoader* loader)
void Color_ReadDirect_16b_4444(VertexLoader* loader)
{
_SetCol4444(loader, *(u16*)DataGetPosition());
DataSkip(2);
}
void LOADERDECL Color_ReadDirect_24b_6666(VertexLoader* loader)
void Color_ReadDirect_24b_6666(VertexLoader* loader)
{
_SetCol6666(loader, Common::swap32(DataGetPosition() - 1));
DataSkip(3);
}
void LOADERDECL Color_ReadDirect_32b_8888(VertexLoader* loader)
void Color_ReadDirect_32b_8888(VertexLoader* loader)
{
_SetCol(loader, DataReadU32Unswapped());
}
@ -146,16 +146,16 @@ void Color_ReadIndex_32b_8888(VertexLoader* loader)
_SetCol(loader, _Read32(iAddress));
}
void LOADERDECL Color_ReadIndex8_16b_565(VertexLoader* loader) { Color_ReadIndex_16b_565<u8>(loader); }
void LOADERDECL Color_ReadIndex8_24b_888(VertexLoader* loader) { Color_ReadIndex_24b_888<u8>(loader); }
void LOADERDECL Color_ReadIndex8_32b_888x(VertexLoader* loader) { Color_ReadIndex_32b_888x<u8>(loader); }
void LOADERDECL Color_ReadIndex8_16b_4444(VertexLoader* loader) { Color_ReadIndex_16b_4444<u8>(loader); }
void LOADERDECL Color_ReadIndex8_24b_6666(VertexLoader* loader) { Color_ReadIndex_24b_6666<u8>(loader); }
void LOADERDECL Color_ReadIndex8_32b_8888(VertexLoader* loader) { Color_ReadIndex_32b_8888<u8>(loader); }
void Color_ReadIndex8_16b_565(VertexLoader* loader) { Color_ReadIndex_16b_565<u8>(loader); }
void Color_ReadIndex8_24b_888(VertexLoader* loader) { Color_ReadIndex_24b_888<u8>(loader); }
void Color_ReadIndex8_32b_888x(VertexLoader* loader) { Color_ReadIndex_32b_888x<u8>(loader); }
void Color_ReadIndex8_16b_4444(VertexLoader* loader) { Color_ReadIndex_16b_4444<u8>(loader); }
void Color_ReadIndex8_24b_6666(VertexLoader* loader) { Color_ReadIndex_24b_6666<u8>(loader); }
void Color_ReadIndex8_32b_8888(VertexLoader* loader) { Color_ReadIndex_32b_8888<u8>(loader); }
void LOADERDECL Color_ReadIndex16_16b_565(VertexLoader* loader) { Color_ReadIndex_16b_565<u16>(loader); }
void LOADERDECL Color_ReadIndex16_24b_888(VertexLoader* loader) { Color_ReadIndex_24b_888<u16>(loader); }
void LOADERDECL Color_ReadIndex16_32b_888x(VertexLoader* loader) { Color_ReadIndex_32b_888x<u16>(loader); }
void LOADERDECL Color_ReadIndex16_16b_4444(VertexLoader* loader) { Color_ReadIndex_16b_4444<u16>(loader); }
void LOADERDECL Color_ReadIndex16_24b_6666(VertexLoader* loader) { Color_ReadIndex_24b_6666<u16>(loader); }
void LOADERDECL Color_ReadIndex16_32b_8888(VertexLoader* loader) { Color_ReadIndex_32b_8888<u16>(loader); }
void Color_ReadIndex16_16b_565(VertexLoader* loader) { Color_ReadIndex_16b_565<u16>(loader); }
void Color_ReadIndex16_24b_888(VertexLoader* loader) { Color_ReadIndex_24b_888<u16>(loader); }
void Color_ReadIndex16_32b_888x(VertexLoader* loader) { Color_ReadIndex_32b_888x<u16>(loader); }
void Color_ReadIndex16_16b_4444(VertexLoader* loader) { Color_ReadIndex_16b_4444<u16>(loader); }
void Color_ReadIndex16_24b_6666(VertexLoader* loader) { Color_ReadIndex_24b_6666<u16>(loader); }
void Color_ReadIndex16_32b_8888(VertexLoader* loader) { Color_ReadIndex_32b_8888<u16>(loader); }

36
Source/Core/VideoCommon/VertexLoader_Color.h
View File

@ -8,23 +8,23 @@
class VertexLoader;
void LOADERDECL Color_ReadDirect_24b_888(VertexLoader* loader);
void LOADERDECL Color_ReadDirect_32b_888x(VertexLoader* loader);
void LOADERDECL Color_ReadDirect_16b_565(VertexLoader* loader);
void LOADERDECL Color_ReadDirect_16b_4444(VertexLoader* loader);
void LOADERDECL Color_ReadDirect_24b_6666(VertexLoader* loader);
void LOADERDECL Color_ReadDirect_32b_8888(VertexLoader* loader);
void Color_ReadDirect_24b_888(VertexLoader* loader);
void Color_ReadDirect_32b_888x(VertexLoader* loader);
void Color_ReadDirect_16b_565(VertexLoader* loader);
void Color_ReadDirect_16b_4444(VertexLoader* loader);
void Color_ReadDirect_24b_6666(VertexLoader* loader);
void Color_ReadDirect_32b_8888(VertexLoader* loader);
void LOADERDECL Color_ReadIndex8_16b_565(VertexLoader* loader);
void LOADERDECL Color_ReadIndex8_24b_888(VertexLoader* loader);
void LOADERDECL Color_ReadIndex8_32b_888x(VertexLoader* loader);
void LOADERDECL Color_ReadIndex8_16b_4444(VertexLoader* loader);
void LOADERDECL Color_ReadIndex8_24b_6666(VertexLoader* loader);
void LOADERDECL Color_ReadIndex8_32b_8888(VertexLoader* loader);
void Color_ReadIndex8_16b_565(VertexLoader* loader);
void Color_ReadIndex8_24b_888(VertexLoader* loader);
void Color_ReadIndex8_32b_888x(VertexLoader* loader);
void Color_ReadIndex8_16b_4444(VertexLoader* loader);
void Color_ReadIndex8_24b_6666(VertexLoader* loader);
void Color_ReadIndex8_32b_8888(VertexLoader* loader);
void LOADERDECL Color_ReadIndex16_16b_565(VertexLoader* loader);
void LOADERDECL Color_ReadIndex16_24b_888(VertexLoader* loader);
void LOADERDECL Color_ReadIndex16_32b_888x(VertexLoader* loader);
void LOADERDECL Color_ReadIndex16_16b_4444(VertexLoader* loader);
void LOADERDECL Color_ReadIndex16_24b_6666(VertexLoader* loader);
void LOADERDECL Color_ReadIndex16_32b_8888(VertexLoader* loader);
void Color_ReadIndex16_16b_565(VertexLoader* loader);
void Color_ReadIndex16_24b_888(VertexLoader* loader);
void Color_ReadIndex16_32b_888x(VertexLoader* loader);
void Color_ReadIndex16_16b_4444(VertexLoader* loader);
void Color_ReadIndex16_24b_6666(VertexLoader* loader);
void Color_ReadIndex16_32b_8888(VertexLoader* loader);

6
Source/Core/VideoCommon/VertexLoader_Normal.cpp
View File

@ -56,7 +56,7 @@ __forceinline void ReadIndirect(const T* data)
template <typename T, int N>
struct Normal_Direct
{
static void LOADERDECL function(VertexLoader* loader)
static void function(VertexLoader* loader)
{
auto const source = reinterpret_cast<const T*>(DataGetPosition());
ReadIndirect<T, N * 3>(source);
@ -80,7 +80,7 @@ __forceinline void Normal_Index_Offset()
template <typename I, typename T, int N>
struct Normal_Index
{
static void LOADERDECL function(VertexLoader* loader)
static void function(VertexLoader* loader)
{
Normal_Index_Offset<I, T, N, 0>();
}
@ -91,7 +91,7 @@ struct Normal_Index
template <typename I, typename T>
struct Normal_Index_Indices3
{
static void LOADERDECL function(VertexLoader* loader)
static void function(VertexLoader* loader)
{
Normal_Index_Offset<I, T, 1, 0>();
Normal_Index_Offset<I, T, 1, 1>();

4
Source/Core/VideoCommon/VertexLoader_Position.cpp
View File

@ -24,7 +24,7 @@ float PosScale(float val, float scale)
}
template <typename T, int N>
void LOADERDECL Pos_ReadDirect(VertexLoader* loader)
void Pos_ReadDirect(VertexLoader* loader)
{
static_assert(N <= 3, "N > 3 is not sane!");
auto const scale = loader->m_posScale;
@ -45,7 +45,7 @@ void LOADERDECL Pos_ReadDirect(VertexLoader* loader)
}
template <typename I, typename T, int N>
void LOADERDECL Pos_ReadIndex(VertexLoader* loader)
void Pos_ReadIndex(VertexLoader* loader)
{
static_assert(std::is_unsigned<I>::value, "Only unsigned I is sane!");
static_assert(N <= 3, "N > 3 is not sane!");

6
Source/Core/VideoCommon/VertexLoader_TextCoord.cpp
View File

@ -28,7 +28,7 @@ __forceinline void LOG_TEX<2>()
// PRIM_LOG("tex: %f %f, ", ((float*)g_vertex_manager_write_ptr)[-2], ((float*)g_vertex_manager_write_ptr)[-1]);
}
static void LOADERDECL TexCoord_Read_Dummy(VertexLoader* loader)
static void TexCoord_Read_Dummy(VertexLoader* loader)
{
loader->m_tcIndex++;
}
@ -46,7 +46,7 @@ float TCScale(float val, float scale)
}
template <typename T, int N>
void LOADERDECL TexCoord_ReadDirect(VertexLoader* loader)
void TexCoord_ReadDirect(VertexLoader* loader)
{
auto const scale = loader->m_tcScale[loader->m_tcIndex];
DataReader dst(g_vertex_manager_write_ptr, nullptr);
@ -63,7 +63,7 @@ void LOADERDECL TexCoord_ReadDirect(VertexLoader* loader)
}
template <typename I, typename T, int N>
void LOADERDECL TexCoord_ReadIndex(VertexLoader* loader)
void TexCoord_ReadIndex(VertexLoader* loader)
{
static_assert(std::is_unsigned<I>::value, "Only unsigned I is sane!");