diff options
| author | degasus <wickmarkus@web.de> | 2014-11-29 03:39:24 +0100 |
|---|---|---|
| committer | degasus <wickmarkus@web.de> | 2014-12-09 18:56:27 +0100 |
| commit | 50de4238bb1bbceb4797821d8ec428ab1d075aaa (patch) | |
| tree | 5c3476e5702c9a909d5fc6863011925990d9647a /Source/Core/VideoCommon/DataReader.h | |
| parent | 21970c4a2a728669687a687f61a8f7453319dd54 (diff) | |
VertexLoader: Move the old Datareader function into VertexLoader
Diffstat (limited to 'Source/Core/VideoCommon/DataReader.h')
| -rw-r--r-- | Source/Core/VideoCommon/DataReader.h | 86 |
1 files changed, 0 insertions, 86 deletions
diff --git a/Source/Core/VideoCommon/DataReader.h b/Source/Core/VideoCommon/DataReader.h index ce862c83b4..f7e030739f 100644 --- a/Source/Core/VideoCommon/DataReader.h +++ b/Source/Core/VideoCommon/DataReader.h @@ -5,9 +5,6 @@ #pragma once #include "Common/Common.h" -#include "VideoCommon/VertexManagerBase.h" - -extern u8* g_video_buffer_read_ptr; class DataReader { @@ -66,86 +63,3 @@ private: u8* __restrict buffer; u8* end; }; - -__forceinline void DataSkip(u32 skip) -{ - g_video_buffer_read_ptr += skip; -} - -// probably unnecessary -template <int count> -__forceinline void DataSkip() -{ - g_video_buffer_read_ptr += count; -} - -template <typename T> -__forceinline T DataPeek(int _uOffset, u8** bufp = &g_video_buffer_read_ptr) -{ - auto const result = Common::FromBigEndian(*reinterpret_cast<T*>(*bufp + _uOffset)); - return 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) -{ - auto const result = DataPeek<T>(0, bufp); - *bufp += sizeof(T); - 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 tmp = *(u32*)g_video_buffer_read_ptr; - g_video_buffer_read_ptr += 4; - return tmp; -} - -__forceinline u8* DataGetPosition() -{ - return g_video_buffer_read_ptr; -} - -template <typename T> -__forceinline void DataWrite(T data) -{ - *(T*)VertexManager::s_pCurBufferPointer = data; - VertexManager::s_pCurBufferPointer += sizeof(T); -} |
