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

VertexLoaderUtils: Get rid of pointer casts 

Eliminates most ubsan asserts that stem from VideoCommon when running starfield.
This commit is contained in:
Lioncash 2015-09-17 14:24:06 -04:00
parent 7681d7b67a
commit 28d1001ff8
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,6 +4,7 @@
#pragma once #pragma once
#include <cstring>
#include "Common/Common.h" #include "Common/Common.h"
#include "VideoCommon/VertexManagerBase.h" #include "VideoCommon/VertexManagerBase.h"
@ -24,10 +25,11 @@ __forceinline void DataSkip()
} }
template <typename T> template <typename T>
__forceinline T DataPeek(int _uOffset, u8** bufp = &g_video_buffer_read_ptr) __forceinline T DataPeek(int _uOffset, u8* bufp = g_video_buffer_read_ptr)
{ {
auto const result = Common::FromBigEndian(*reinterpret_cast<T*>(*bufp + _uOffset)); T result;
return result; std::memcpy(&result, &bufp[_uOffset], sizeof(T));
return Common::FromBigEndian(result);
} }
// TODO: kill these // TODO: kill these
@ -49,7 +51,7 @@ __forceinline u32 DataPeek32(int _uOffset)
template <typename T> template <typename T>
__forceinline T DataRead(u8** bufp = &g_video_buffer_read_ptr) __forceinline T DataRead(u8** bufp = &g_video_buffer_read_ptr)
{ {
auto const result = DataPeek<T>(0, bufp); auto const result = DataPeek<T>(0, *bufp);
*bufp += sizeof(T); *bufp += sizeof(T);
return result; return result;
} }
@ -77,9 +79,10 @@ __forceinline u32 DataReadU32()
__forceinline u32 DataReadU32Unswapped() __forceinline u32 DataReadU32Unswapped()
{ {
u32 tmp = *(u32*)g_video_buffer_read_ptr; u32 result;
g_video_buffer_read_ptr += 4; std::memcpy(&result, g_video_buffer_read_ptr, sizeof(u32));
return tmp; g_video_buffer_read_ptr += sizeof(u32);
return result;
} }
__forceinline u8* DataGetPosition() __forceinline u8* DataGetPosition()
@ -90,6 +93,6 @@ __forceinline u8* DataGetPosition()
template <typename T> template <typename T>
__forceinline void DataWrite(T data) __forceinline void DataWrite(T data)
{ {
*(T*)g_vertex_manager_write_ptr = data; std::memcpy(g_vertex_manager_write_ptr, &data, sizeof(T));
g_vertex_manager_write_ptr += sizeof(T); g_vertex_manager_write_ptr += sizeof(T);
} }