From: Nicolas Capens <capn@google.com>
Date: Thu, 5 Feb 2015 17:36:46 +0000 (-0500)
Subject: Make Function variadic and take a function signature.
X-Git-Tag: android-x86-7.1-r1~701
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=2ab859f2de2d8282111376603602e0ebaa8a6037;p=android-x86%2Fexternal-swiftshader.git

Make Function variadic and take a function signature.

Change-Id: If36ea6e74311f54bb4c2b0bc1b5b7ccd0e97d74b
Reviewed-on: https://swiftshader-review.googlesource.com/4548
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
Tested-by: Nicolas Capens <capn@google.com>
---

diff --git a/src/Main/FrameBuffer.cpp b/src/Main/FrameBuffer.cpp
index bb1151fb2..cd387c8d8 100644
--- a/src/Main/FrameBuffer.cpp
+++ b/src/Main/FrameBuffer.cpp
@@ -234,7 +234,7 @@ namespace sw
 			bool validKey = ValidateSerialNumber(validationKey, CHECKSUM_KEY, SERIAL_PREFIX);
 		#endif
 
-		Function<Void, Pointer<Byte>, Pointer<Byte> > function;
+		Function<Void(Pointer<Byte>, Pointer<Byte>)> function;
 		{
 			Pointer<Byte> dst(function.arg(0));
 			Pointer<Byte> src(function.arg(1));
diff --git a/src/Reactor/Nucleus.hpp b/src/Reactor/Nucleus.hpp
index e84f57d1f..b4758c06e 100644
--- a/src/Reactor/Nucleus.hpp
+++ b/src/Reactor/Nucleus.hpp
@@ -2475,8 +2475,13 @@ namespace sw
 	template<class T>
 	void Return(RValue<Pointer<T> > ret);
 
-	template<class R = Void, class A1 = Void, class A2 = Void, class A3 = Void, class A4 = Void>
-	class Function
+	// Generic template, leave undefined!
+	template<typename FunctionType>
+	class Function;
+
+	// Specialized for function types
+	template<typename Return, typename... Arguments>
+	class Function<Return(Arguments...)>
 	{
 	public:
 		Function();
@@ -2917,34 +2922,35 @@ namespace sw
 		Nucleus::setInsertBlock(Nucleus::createBasicBlock());
 	}
 
-	template<class R, class A1, class A2, class A3, class A4>
-	Function<R, A1, A2, A3, A4>::Function()
+	template<typename Return, typename... Arguments>
+	Function<Return(Arguments...)>::Function()
 	{
 		core = new Nucleus();
 
-		if(!A1::isVoid()) arguments.push_back(A1::getType());
-		if(!A2::isVoid()) arguments.push_back(A2::getType());
-		if(!A3::isVoid()) arguments.push_back(A3::getType());
-		if(!A4::isVoid()) arguments.push_back(A4::getType());
+		llvm::Type *types[] = {Arguments::getType()...};
+		for(llvm::Type *type : types)
+		{
+			arguments.push_back(type);
+		} 
 
-		function = Nucleus::createFunction(R::getType(), arguments);
+		function = Nucleus::createFunction(Return::getType(), arguments);
 		Nucleus::setFunction(function);
 	}
 
-	template<class R, class A1, class A2, class A3, class A4>
-	Function<R, A1, A2, A3, A4>::~Function()
+	template<typename Return, typename... Arguments>
+	Function<Return(Arguments...)>::~Function()
 	{
 		delete core;
 	}
 
-	template<class R, class A1, class A2, class A3, class A4>
-	llvm::Argument *Function<R, A1, A2, A3, A4>::arg(int index)
+	template<typename Return, typename... Arguments>
+	llvm::Argument *Function<Return(Arguments...)>::arg(int index)
 	{
 		return Nucleus::getArgument(function, index);
 	}
 
-	template<class R, class A1, class A2, class A3, class A4>
-	Routine *Function<R, A1, A2, A3, A4>::operator()(const wchar_t *name, ...)
+	template<typename Return, typename... Arguments>
+	Routine *Function<Return(Arguments...)>::operator()(const wchar_t *name, ...)
 	{
 		wchar_t fullName[1024 + 1];
 
diff --git a/src/Renderer/Blitter.cpp b/src/Renderer/Blitter.cpp
index df934f345..677b343dd 100644
--- a/src/Renderer/Blitter.cpp
+++ b/src/Renderer/Blitter.cpp
@@ -964,7 +964,7 @@ namespace sw
 
 	Routine *Blitter::generate(BlitState &state)
 	{
-		Function<Void, Pointer<Byte> > function;
+		Function<Void(Pointer<Byte>)> function;
 		{
 			Pointer<Byte> blit(function.arg(0));
 
diff --git a/src/Renderer/QuadRasterizer.cpp b/src/Renderer/QuadRasterizer.cpp
index 40c84e9c4..dfee2f643 100644
--- a/src/Renderer/QuadRasterizer.cpp
+++ b/src/Renderer/QuadRasterizer.cpp
@@ -47,7 +47,7 @@ namespace sw
 
 	void QuadRasterizer::generate()
 	{
-		Function<Void, Pointer<Byte>, Int, Int, Pointer<Byte> > function;
+		Function<Void(Pointer<Byte>, Int, Int, Pointer<Byte>)> function;
 		{
 			#if PERF_PROFILE
 				Long pixelTime = Ticks();
diff --git a/src/Shader/SetupRoutine.cpp b/src/Shader/SetupRoutine.cpp
index 675d8a088..08cdf5903 100644
--- a/src/Shader/SetupRoutine.cpp
+++ b/src/Shader/SetupRoutine.cpp
@@ -34,7 +34,7 @@ namespace sw
 
 	void SetupRoutine::generate()
 	{
-		Function<Bool, Pointer<Byte>, Pointer<Byte>, Pointer<Byte>, Pointer<Byte> > function;
+		Function<Bool(Pointer<Byte>, Pointer<Byte>, Pointer<Byte>, Pointer<Byte>)> function;
 		{
 			Pointer<Byte> primitive(function.arg(0));
 			Pointer<Byte> tri(function.arg(1));
diff --git a/src/Shader/VertexRoutine.cpp b/src/Shader/VertexRoutine.cpp
index e6806a1e7..60b193d0c 100644
--- a/src/Shader/VertexRoutine.cpp
+++ b/src/Shader/VertexRoutine.cpp
@@ -34,7 +34,7 @@ namespace sw
 
 	void VertexRoutine::generate()
 	{
-		Function<Void, Pointer<Byte>, Pointer<Byte>, Pointer<Byte>, Pointer<Byte> > function;
+		Function<Void(Pointer<Byte>, Pointer<Byte>, Pointer<Byte>, Pointer<Byte>)> function;
 		{
 			Pointer<Byte> vertex(function.arg(0));
 			Pointer<Byte> batch(function.arg(1));