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

Convert some ugly macros to templates. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2189 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
hrydgard 2009-02-09 21:24:32 +00:00
parent 4200f69c5a
commit e979db862c
2 changed files with 44 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/VideoCommon/Src/VertexLoader_Color.cpp
View File

@ -202,8 +202,7 @@ void LOADERDECL Color_ReadIndex16_16b_4444()
void LOADERDECL Color_ReadIndex16_24b_6666() void LOADERDECL Color_ReadIndex16_24b_6666()
{ {
u16 Index = DataReadU16(); u16 Index = DataReadU16();
const u8 *iAddress = cached_arraybases[ARRAY_COLOR+colIndex] + (Index * arraystrides[ARRAY_COLOR+colIndex]); const u8 *pData = cached_arraybases[ARRAY_COLOR+colIndex] + (Index * arraystrides[ARRAY_COLOR+colIndex]);
const u8* pData = iAddress;
u32 val = *(pData+2) | ((*(pData+1))<<8) | ((*pData)<<16); u32 val = *(pData+2) | ((*(pData+1))<<8) | ((*pData)<<16);
_SetCol6666(val); _SetCol6666(val);
} }

82
Source/Core/VideoCommon/Src/VertexLoader_Position.cpp
View File

@ -137,40 +137,42 @@ void LOADERDECL Pos_ReadDirect_Float()
VertexManager::s_pCurBufferPointer += 12; VertexManager::s_pCurBufferPointer += 12;
} }
#define Pos_ReadIndex_Byte(T) { \ template<class T>
const u8* pData = cached_arraybases[ARRAY_POSITION] + ((u32)Index * arraystrides[ARRAY_POSITION]);\ inline void Pos_ReadIndex_Byte(int Index) {
((float*)VertexManager::s_pCurBufferPointer)[0] = ((float)(T)(*(pData))) * posScale; \ const u8* pData = cached_arraybases[ARRAY_POSITION] + ((u32)Index * arraystrides[ARRAY_POSITION]);
((float*)VertexManager::s_pCurBufferPointer)[1] = ((float)(T)(*(pData+1))) * posScale; \ ((float*)VertexManager::s_pCurBufferPointer)[0] = ((float)(T)(*(pData))) * posScale;
if (pVtxAttr->PosElements) \ ((float*)VertexManager::s_pCurBufferPointer)[1] = ((float)(T)(*(pData+1))) * posScale;
((float*)VertexManager::s_pCurBufferPointer)[2] = ((float)(T)(*(pData+2))) * posScale; \ if (pVtxAttr->PosElements)
else \ ((float*)VertexManager::s_pCurBufferPointer)[2] = ((float)(T)(*(pData+2))) * posScale;
((float*)VertexManager::s_pCurBufferPointer)[2] = 1.0f; \ else
LOG_VTX(); \ ((float*)VertexManager::s_pCurBufferPointer)[2] = 1.0f;
VertexManager::s_pCurBufferPointer += 12; \ LOG_VTX();
VertexManager::s_pCurBufferPointer += 12;
} }
#define Pos_ReadIndex_Short(T) { \ template<class T>
const u16* pData = (const u16 *)(cached_arraybases[ARRAY_POSITION] + ((u32)Index * arraystrides[ARRAY_POSITION])); \ inline void Pos_ReadIndex_Short(int Index) {
((float*)VertexManager::s_pCurBufferPointer)[0] = ((float)(T)Common::swap16(*(pData))) * posScale; \ const u16* pData = (const u16 *)(cached_arraybases[ARRAY_POSITION] + ((u32)Index * arraystrides[ARRAY_POSITION]));
((float*)VertexManager::s_pCurBufferPointer)[1] = ((float)(T)Common::swap16(*(pData+1))) * posScale;\ ((float*)VertexManager::s_pCurBufferPointer)[0] = ((float)(T)Common::swap16(*(pData))) * posScale;
if (pVtxAttr->PosElements) \ ((float*)VertexManager::s_pCurBufferPointer)[1] = ((float)(T)Common::swap16(*(pData+1))) * posScale;
((float*)VertexManager::s_pCurBufferPointer)[2] = ((float)(T)Common::swap16(*(pData+2))) * posScale;\ if (pVtxAttr->PosElements)
else \ ((float*)VertexManager::s_pCurBufferPointer)[2] = ((float)(T)Common::swap16(*(pData+2))) * posScale;
((float*)VertexManager::s_pCurBufferPointer)[2] = 1.0f; \ else
LOG_VTX(); \ ((float*)VertexManager::s_pCurBufferPointer)[2] = 1.0f;
VertexManager::s_pCurBufferPointer += 12; \ LOG_VTX();
VertexManager::s_pCurBufferPointer += 12;
} }
#define Pos_ReadIndex_Float() { \ inline void Pos_ReadIndex_Float(int Index) {
const u32* pData = (const u32 *)(cached_arraybases[ARRAY_POSITION] + (Index * arraystrides[ARRAY_POSITION])); \ const u32* pData = (const u32 *)(cached_arraybases[ARRAY_POSITION] + (Index * arraystrides[ARRAY_POSITION]));
((u32*)VertexManager::s_pCurBufferPointer)[0] = Common::swap32(*(pData)); \ ((u32*)VertexManager::s_pCurBufferPointer)[0] = Common::swap32(*(pData));
((u32*)VertexManager::s_pCurBufferPointer)[1] = Common::swap32(*(pData+1)); \ ((u32*)VertexManager::s_pCurBufferPointer)[1] = Common::swap32(*(pData+1));
if (pVtxAttr->PosElements) \ if (pVtxAttr->PosElements)
((u32*)VertexManager::s_pCurBufferPointer)[2] = Common::swap32(*(pData+2)); \ ((u32*)VertexManager::s_pCurBufferPointer)[2] = Common::swap32(*(pData+2));
else \ else
((float*)VertexManager::s_pCurBufferPointer)[2] = 1.0f; \ ((float*)VertexManager::s_pCurBufferPointer)[2] = 1.0f;
LOG_VTX(); \ LOG_VTX();
VertexManager::s_pCurBufferPointer += 12; \ VertexManager::s_pCurBufferPointer += 12;
} }
// ============================================================================== // ==============================================================================
@ -179,31 +181,31 @@ void LOADERDECL Pos_ReadDirect_Float()
void LOADERDECL Pos_ReadIndex8_UByte() void LOADERDECL Pos_ReadIndex8_UByte()
{ {
u8 Index = DataReadU8(); u8 Index = DataReadU8();
Pos_ReadIndex_Byte(u8); Pos_ReadIndex_Byte<u8>(Index);
} }
void LOADERDECL Pos_ReadIndex8_Byte() void LOADERDECL Pos_ReadIndex8_Byte()
{ {
u8 Index = DataReadU8(); u8 Index = DataReadU8();
Pos_ReadIndex_Byte(s8); Pos_ReadIndex_Byte<s8>(Index);
} }
void LOADERDECL Pos_ReadIndex8_UShort() void LOADERDECL Pos_ReadIndex8_UShort()
{ {
u8 Index = DataReadU8(); u8 Index = DataReadU8();
Pos_ReadIndex_Short(u16); Pos_ReadIndex_Short<u16>(Index);
} }
void LOADERDECL Pos_ReadIndex8_Short() void LOADERDECL Pos_ReadIndex8_Short()
{ {
u8 Index = DataReadU8(); u8 Index = DataReadU8();
Pos_ReadIndex_Short(s16); Pos_ReadIndex_Short<s16>(Index);
} }
void LOADERDECL Pos_ReadIndex8_Float() void LOADERDECL Pos_ReadIndex8_Float()
{ {
u8 Index = DataReadU8(); u8 Index = DataReadU8();
Pos_ReadIndex_Float(); Pos_ReadIndex_Float(Index);
} }
// ============================================================================== // ==============================================================================
@ -212,29 +214,29 @@ void LOADERDECL Pos_ReadIndex8_Float()
void LOADERDECL Pos_ReadIndex16_UByte(){ void LOADERDECL Pos_ReadIndex16_UByte(){
u16 Index = DataReadU16(); u16 Index = DataReadU16();
Pos_ReadIndex_Byte(u8); Pos_ReadIndex_Byte<u8>(Index);
} }
void LOADERDECL Pos_ReadIndex16_Byte(){ void LOADERDECL Pos_ReadIndex16_Byte(){
u16 Index = DataReadU16(); u16 Index = DataReadU16();
Pos_ReadIndex_Byte(s8); Pos_ReadIndex_Byte<s8>(Index);
} }
void LOADERDECL Pos_ReadIndex16_UShort(){ void LOADERDECL Pos_ReadIndex16_UShort(){
u16 Index = DataReadU16(); u16 Index = DataReadU16();
Pos_ReadIndex_Short(u16); Pos_ReadIndex_Short<u16>(Index);
} }
void LOADERDECL Pos_ReadIndex16_Short() void LOADERDECL Pos_ReadIndex16_Short()
{ {
u16 Index = DataReadU16(); u16 Index = DataReadU16();
Pos_ReadIndex_Short(s16); Pos_ReadIndex_Short<s16>(Index);
} }
void LOADERDECL Pos_ReadIndex16_Float() void LOADERDECL Pos_ReadIndex16_Float()
{ {
u16 Index = DataReadU16(); u16 Index = DataReadU16();
Pos_ReadIndex_Float(); Pos_ReadIndex_Float(Index);
} }
#endif #endif