From d2fad90bfef5155452be0450e7b3caae19d50295 Mon Sep 17 00:00:00 2001
From: Nicolas Capens <capn@google.com>
Date: Fri, 15 Jan 2016 17:35:58 -0500
Subject: [PATCH] Move parameter reading to a prototype constructor.
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Bug 22652760

Change-Id: I317275cd2c15012da3a859735409af07ea9b2923
Reviewed-on: https://swiftshader-review.googlesource.com/4559
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
---
 src/Shader/VertexRoutine.cpp | 11 +++--------
 src/Shader/VertexRoutine.hpp | 31 +++++++++++++++++++++----------
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/src/Shader/VertexRoutine.cpp b/src/Shader/VertexRoutine.cpp
index 50bbf144e..87d1fa00f 100644
--- a/src/Shader/VertexRoutine.cpp
+++ b/src/Shader/VertexRoutine.cpp
@@ -33,11 +33,6 @@ namespace sw
 
 	void VertexRoutine::generate()
 	{
-		Pointer<Byte> vertex(Arg<0>());
-		Pointer<Byte> batch(Arg<1>());
-		Pointer<Byte> task(Arg<2>());
-		Pointer<Byte> data(Arg<3>());
-
 		const bool texldl = state.shaderContainsTexldl;
 
 		Pointer<Byte> cache = task + OFFSET(VertexTask,vertexCache);
@@ -47,7 +42,7 @@ namespace sw
 		UInt vertexCount = *Pointer<UInt>(task + OFFSET(VertexTask,vertexCount));
 
 		r.data = data;
-		r.constants = *Pointer<Pointer<Byte> >(data + OFFSET(DrawData,constants));
+		r.constants = *Pointer<Pointer<Byte>>(data + OFFSET(DrawData,constants));
 		if(shader && shader->instanceIdDeclared)
 		{
 			r.instanceID = *Pointer<Int>(data + OFFSET(DrawData, instanceID));
@@ -89,7 +84,7 @@ namespace sw
 	{
 		for(int i = 0; i < VERTEX_ATTRIBUTES; i++)
 		{
-			Pointer<Byte> input = *Pointer<Pointer<Byte> >(r.data + OFFSET(DrawData,input) + sizeof(void*) * i);
+			Pointer<Byte> input = *Pointer<Pointer<Byte>>(r.data + OFFSET(DrawData,input) + sizeof(void*) * i);
 			UInt stride = *Pointer<UInt>(r.data + OFFSET(DrawData,stride) + sizeof(unsigned int) * i);
 
 			r.v[i] = readStream(input, stride, state.input[i], index);
@@ -573,7 +568,7 @@ namespace sw
 		*Pointer<Float4>(cacheLine + OFFSET(Vertex,X) + sizeof(Vertex) * 3, 16) = v.w;
 	}
 
-	void VertexRoutine::writeVertex(Pointer<Byte> &vertex, Pointer<Byte> &cache)
+	void VertexRoutine::writeVertex(const Pointer<Byte> &vertex, Pointer<Byte> &cache)
 	{
 		for(int i = 0; i < 12; i++)
 		{
diff --git a/src/Shader/VertexRoutine.hpp b/src/Shader/VertexRoutine.hpp
index 66ec137e1..3eec92490 100644
--- a/src/Shader/VertexRoutine.hpp
+++ b/src/Shader/VertexRoutine.hpp
@@ -19,8 +19,27 @@
 
 namespace sw
 {
-	class VertexRoutine : public Function<Void(Pointer<Byte>, Pointer<Byte>, Pointer<Byte>, Pointer<Byte>)>
+	class VertexRoutinePrototype : public Function<Void(Pointer<Byte>, Pointer<Byte>, Pointer<Byte>, Pointer<Byte>)>
 	{
+	public:
+		VertexRoutinePrototype() : vertex(Arg<0>()), batch(Arg<1>()), task(Arg<2>()), data(Arg<3>()) {}
+		virtual ~VertexRoutinePrototype() {};
+
+	protected:
+		const Pointer<Byte> vertex;
+		const Pointer<Byte> batch;
+		const Pointer<Byte> task;
+		const Pointer<Byte> data;
+	};
+
+	class VertexRoutine : public VertexRoutinePrototype
+	{
+	public:
+		VertexRoutine(const VertexProcessor::State &state, const VertexShader *shader);
+		virtual ~VertexRoutine();
+
+		void generate();
+
 	protected:
 		struct Registers
 		{
@@ -73,14 +92,6 @@ namespace sw
 
 		Registers r;
 
-	public:
-		VertexRoutine(const VertexProcessor::State &state, const VertexShader *shader);
-
-		virtual ~VertexRoutine();
-
-		void generate();
-
-	protected:
 		const VertexProcessor::State &state;
 		const VertexShader *const shader;
 
@@ -94,7 +105,7 @@ namespace sw
 		void computeClipFlags();
 		void postTransform();
 		void writeCache(Pointer<Byte> &cacheLine);
-		void writeVertex(Pointer<Byte> &vertex, Pointer<Byte> &cacheLine);
+		void writeVertex(const Pointer<Byte> &vertex, Pointer<Byte> &cacheLine);
 	};
 }
 
-- 
2.11.0