From 27f984c02ee8293f2a1542968bdaff8cc8cedb73 Mon Sep 17 00:00:00 2001
From: degasus <wickmarkus@web.de>
Date: Mon, 24 Nov 2014 22:22:42 +0100
Subject: VideoCommon: rewrite DataReader

---
 Source/Core/VideoCommon/VertexLoader_Position.cpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'Source/Core/VideoCommon/VertexLoader_Position.cpp')

diff --git a/Source/Core/VideoCommon/VertexLoader_Position.cpp b/Source/Core/VideoCommon/VertexLoader_Position.cpp
index 6c50dd1560..4dacfd6042 100644
--- a/Source/Core/VideoCommon/VertexLoader_Position.cpp
+++ b/Source/Core/VideoCommon/VertexLoader_Position.cpp
@@ -75,12 +75,14 @@ void LOADERDECL Pos_ReadDirect()
 {
 	static_assert(N <= 3, "N > 3 is not sane!");
 	auto const scale = posScale[0];
-	DataWriter dst;
-	DataReader src;
+	DataReader dst(VertexManager::s_pCurBufferPointer, nullptr);
+	DataReader src(g_video_buffer_read_ptr, nullptr);
 
 	for (int i = 0; i < 3; ++i)
 		dst.Write(i<N ? PosScale(src.Read<T>(), scale) : 0.f);
 
+	dst.WritePointer(&VertexManager::s_pCurBufferPointer);
+	src.WritePointer(&g_video_buffer_read_ptr);
 	LOG_VTX();
 }
 
@@ -93,11 +95,12 @@ void LOADERDECL Pos_ReadIndex()
 	auto const index = DataRead<I>();
 	auto const data = reinterpret_cast<const T*>(cached_arraybases[ARRAY_POSITION] + (index * g_main_cp_state.array_strides[ARRAY_POSITION]));
 	auto const scale = posScale[0];
-	DataWriter dst;
+	DataReader dst(VertexManager::s_pCurBufferPointer, nullptr);
 
 	for (int i = 0; i < 3; ++i)
 		dst.Write(i<N ? PosScale(Common::FromBigEndian(data[i]), scale) : 0.f);
 
+	dst.WritePointer(&VertexManager::s_pCurBufferPointer);
 	LOG_VTX();
 }
 
-- 
cgit v1.2.3


From 02cdb41d3d3eec73d2c843fe865ff906e01b44a4 Mon Sep 17 00:00:00 2001
From: degasus <wickmarkus@web.de>
Date: Tue, 9 Dec 2014 08:30:38 +0100
Subject: VideoCommon: Rename s_pCurBufferPointer

---
 Source/Core/VideoCommon/VertexLoader_Position.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'Source/Core/VideoCommon/VertexLoader_Position.cpp')

diff --git a/Source/Core/VideoCommon/VertexLoader_Position.cpp b/Source/Core/VideoCommon/VertexLoader_Position.cpp
index 4dacfd6042..60a6115ee0 100644
--- a/Source/Core/VideoCommon/VertexLoader_Position.cpp
+++ b/Source/Core/VideoCommon/VertexLoader_Position.cpp
@@ -13,7 +13,7 @@
 #include "VideoCommon/VideoCommon.h"
 
 // Thoughts on the implementation of a vertex loader compiler.
-// s_pCurBufferPointer should definitely be in a register.
+// g_vertex_manager_write_ptr should definitely be in a register.
 // Could load the position scale factor in XMM7, for example.
 
 // The pointer inside DataReadU8 in another.
@@ -75,13 +75,13 @@ void LOADERDECL Pos_ReadDirect()
 {
 	static_assert(N <= 3, "N > 3 is not sane!");
 	auto const scale = posScale[0];
-	DataReader dst(VertexManager::s_pCurBufferPointer, nullptr);
+	DataReader dst(g_vertex_manager_write_ptr, nullptr);
 	DataReader src(g_video_buffer_read_ptr, nullptr);
 
 	for (int i = 0; i < 3; ++i)
 		dst.Write(i<N ? PosScale(src.Read<T>(), scale) : 0.f);
 
-	dst.WritePointer(&VertexManager::s_pCurBufferPointer);
+	dst.WritePointer(&g_vertex_manager_write_ptr);
 	src.WritePointer(&g_video_buffer_read_ptr);
 	LOG_VTX();
 }
@@ -95,12 +95,12 @@ void LOADERDECL Pos_ReadIndex()
 	auto const index = DataRead<I>();
 	auto const data = reinterpret_cast<const T*>(cached_arraybases[ARRAY_POSITION] + (index * g_main_cp_state.array_strides[ARRAY_POSITION]));
 	auto const scale = posScale[0];
-	DataReader dst(VertexManager::s_pCurBufferPointer, nullptr);
+	DataReader dst(g_vertex_manager_write_ptr, nullptr);
 
 	for (int i = 0; i < 3; ++i)
 		dst.Write(i<N ? PosScale(Common::FromBigEndian(data[i]), scale) : 0.f);
 
-	dst.WritePointer(&VertexManager::s_pCurBufferPointer);
+	dst.WritePointer(&g_vertex_manager_write_ptr);
 	LOG_VTX();
 }
 
-- 
cgit v1.2.3