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

VertexLoaderUtils: remove simple wrapper functions

Browse Source
This commit is contained in:
Tillmann Karras
2015-10-01 09:28:19 +02:00
parent ba20f114eb
commit 9f8981c7c0
4 changed files with 17 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,7 +25,7 @@ u8* g_vertex_manager_write_ptr;
static void PosMtx_ReadDirect_UByte(VertexLoader* loader)
{
u32 posmtx = DataReadU8() & 0x3f;
u32 posmtx = DataRead<u8>() & 0x3f;
if (loader->m_counter < 3)
VertexLoaderManager::position_matrix_index[loader->m_counter] = posmtx;
DataWrite<u32>(posmtx);
@ -34,7 +34,7 @@ static void PosMtx_ReadDirect_UByte(VertexLoader* loader)
static void TexMtx_ReadDirect_UByte(VertexLoader* loader)
{
loader->m_curtexmtx[loader->m_texmtxread] = DataReadU8() & 0x3f;
loader->m_curtexmtx[loader->m_texmtxread] = DataRead<u8>() & 0x3f;
PRIM_LOG("texmtx%d: %d, ", loader->m_texmtxread, loader->m_curtexmtx[loader->m_texmtxread]);
loader->m_texmtxread++;

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

@ -32,22 +32,6 @@ __forceinline T DataPeek(int _uOffset, u8* bufp = g_video_buffer_read_ptr)
return Common::FromBigEndian(result);
}
// TODO: kill these
__forceinline u8 DataPeek8(int _uOffset)
{
return DataPeek<u8>(_uOffset);
}
__forceinline u16 DataPeek16(int _uOffset)
{
return DataPeek<u16>(_uOffset);
}
__forceinline u32 DataPeek32(int _uOffset)
{
return DataPeek<u32>(_uOffset);
}
template <typename T>
__forceinline T DataRead(u8** bufp = &g_video_buffer_read_ptr)
{
@ -56,27 +40,6 @@ __forceinline T DataRead(u8** bufp = &g_video_buffer_read_ptr)
return result;
}
// TODO: kill these
__forceinline u8 DataReadU8()
{
return DataRead<u8>();
}
__forceinline s8 DataReadS8()
{
return DataRead<s8>();
}
__forceinline u16 DataReadU16()
{
return DataRead<u16>();
}
__forceinline u32 DataReadU32()
{
return DataRead<u32>();
}
__forceinline u32 DataReadU32Unswapped()
{
u32 result;

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

@ -85,7 +85,7 @@ void Color_ReadDirect_32b_888x(VertexLoader* loader)
}
void Color_ReadDirect_16b_565(VertexLoader* loader)
{
SetCol565(loader, DataReadU16());
SetCol565(loader, DataRead<u16>());
}
void Color_ReadDirect_16b_4444(VertexLoader* loader)
{