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

DataReader: turn WritePointer into GetPointer

This commit is contained in:
Tillmann Karras 2015-01-06 17:49:27 +01:00
parent 68d204e877
commit 2cedc0034d
7 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/VideoCommon/DataReader.h
View File

@ -15,9 +15,9 @@ public:
__forceinline DataReader(u8* src, u8* _end) __forceinline DataReader(u8* src, u8* _end)
: buffer(src), end(_end) {} : buffer(src), end(_end) {}
__forceinline void WritePointer(u8** src) __forceinline u8* GetPointer()
{ {
*src = buffer; return buffer;
} }
__forceinline u8* operator=(u8* src) __forceinline u8* operator=(u8* src)

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

@ -137,7 +137,7 @@ u8* OpcodeDecoder_Run(DataReader src, u32* cycles, bool in_display_list)
u8* opcodeStart; u8* opcodeStart;
while (true) while (true)
{ {
src.WritePointer(&opcodeStart); opcodeStart = src.GetPointer();
if (!src.size()) if (!src.size())
goto end; goto end;
@ -301,7 +301,7 @@ u8* OpcodeDecoder_Run(DataReader src, u32* cycles, bool in_display_list)
if (!is_preprocess && g_bRecordFifoData && cmd_byte != GX_CMD_CALL_DL) if (!is_preprocess && g_bRecordFifoData && cmd_byte != GX_CMD_CALL_DL)
{ {
u8* opcodeEnd; u8* opcodeEnd;
src.WritePointer(&opcodeEnd); opcodeEnd = src.GetPointer();
FifoRecorder::GetInstance().WriteGPCommand(opcodeStart, u32(opcodeEnd - opcodeStart)); FifoRecorder::GetInstance().WriteGPCommand(opcodeStart, u32(opcodeEnd - opcodeStart));
} }
} }

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

@ -453,8 +453,8 @@ void VertexLoader::WriteSetVariable(int bits, void *address, OpArg value)
int VertexLoader::RunVertices(int primitive, int count, DataReader src, DataReader dst) int VertexLoader::RunVertices(int primitive, int count, DataReader src, DataReader dst)
{ {
dst.WritePointer(&g_vertex_manager_write_ptr); g_vertex_manager_write_ptr = dst.GetPointer();
src.WritePointer(&g_video_buffer_read_ptr); g_video_buffer_read_ptr = src.GetPointer();
m_numLoadedVertices += count; m_numLoadedVertices += count;
m_skippedVertices = 0; m_skippedVertices = 0;

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

@ -159,9 +159,7 @@ public:
if (memcmp(buffer_a.data(), buffer_b.data(), std::min(count_a, count_b))) if (memcmp(buffer_a.data(), buffer_b.data(), std::min(count_a, count_b)))
ERROR_LOG(VIDEO, "Both vertexloaders have loaded different data."); ERROR_LOG(VIDEO, "Both vertexloaders have loaded different data.");
u8* dstptr; memcpy(dst.GetPointer(), buffer_a.data(), count_a);
dst.WritePointer(&dstptr);
memcpy(dstptr, buffer_a.data(), count_a);
return count_a; return count_a;
} }
std::string GetName() const override { return "CompareLoader"; } std::string GetName() const override { return "CompareLoader"; }

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

@ -50,7 +50,7 @@ __forceinline void ReadIndirect(const T* data)
dst.Write(FracAdjust(Common::FromBigEndian(data[i]))); dst.Write(FracAdjust(Common::FromBigEndian(data[i])));
} }
dst.WritePointer(&g_vertex_manager_write_ptr); g_vertex_manager_write_ptr = dst.GetPointer();
LOG_NORM(); LOG_NORM();
} }

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

@ -81,8 +81,8 @@ void LOADERDECL Pos_ReadDirect(VertexLoader* loader)
for (int i = 0; i < 3; ++i) for (int i = 0; i < 3; ++i)
dst.Write(i<N ? PosScale(src.Read<T>(), scale) : 0.f); dst.Write(i<N ? PosScale(src.Read<T>(), scale) : 0.f);
dst.WritePointer(&g_vertex_manager_write_ptr); g_vertex_manager_write_ptr = dst.GetPointer();
src.WritePointer(&g_video_buffer_read_ptr); g_video_buffer_read_ptr = src.GetPointer();
LOG_VTX(); LOG_VTX();
} }
@ -101,7 +101,7 @@ void LOADERDECL Pos_ReadIndex(VertexLoader* loader)
for (int i = 0; i < 3; ++i) for (int i = 0; i < 3; ++i)
dst.Write(i<N ? PosScale(Common::FromBigEndian(data[i]), scale) : 0.f); dst.Write(i<N ? PosScale(Common::FromBigEndian(data[i]), scale) : 0.f);
dst.WritePointer(&g_vertex_manager_write_ptr); g_vertex_manager_write_ptr = dst.GetPointer();
LOG_VTX(); LOG_VTX();
} }

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

@ -56,8 +56,8 @@ void LOADERDECL TexCoord_ReadDirect(VertexLoader* loader)
for (int i = 0; i != N; ++i) for (int i = 0; i != N; ++i)
dst.Write(TCScale(src.Read<T>(), scale)); dst.Write(TCScale(src.Read<T>(), scale));
dst.WritePointer(&g_vertex_manager_write_ptr); g_vertex_manager_write_ptr = dst.GetPointer();
src.WritePointer(&g_video_buffer_read_ptr); g_video_buffer_read_ptr = src.GetPointer();
LOG_TEX<N>(); LOG_TEX<N>();
++loader->m_tcIndex; ++loader->m_tcIndex;
@ -77,7 +77,7 @@ void LOADERDECL TexCoord_ReadIndex(VertexLoader* loader)
for (int i = 0; i != N; ++i) for (int i = 0; i != N; ++i)
dst.Write(TCScale(Common::FromBigEndian(data[i]), scale)); dst.Write(TCScale(Common::FromBigEndian(data[i]), scale));
dst.WritePointer(&g_vertex_manager_write_ptr); g_vertex_manager_write_ptr = dst.GetPointer();
LOG_TEX<N>(); LOG_TEX<N>();
++loader->m_tcIndex; ++loader->m_tcIndex;
} }