Merge pull request RPCS3#2010 from vlj/rsx-refactor

vlj · web-flow · commit 32a03344b3d9 · 2016-07-31T19:32:30.000+02:00
rsx: Fix warning because of unused arguments
diff --git a/rpcs3/Emu/RSX/rsx_decode.h b/rpcs3/Emu/RSX/rsx_decode.h
@@ -4002,7 +4002,7 @@ struct registers_decoder<NV4097_NO_OPERATION>
 		decoded_type(u32) {};
 	};
 
-	static std::string dump(u32 &&decoded_values)
+	static std::string dump(u32 &&)
 	{
 		return "(nop)";
 	}
@@ -4016,7 +4016,7 @@ struct registers_decoder<NV4097_INVALIDATE_VERTEX_CACHE_FILE>
 		decoded_type(u32) {};
 	};
 
-	static std::string dump(u32 &&decoded_values)
+	static std::string dump(u32 &&)
 	{
 		return "(invalidate vertex cache file)";
 	}
@@ -4030,7 +4030,7 @@ struct registers_decoder<NV4097_INVALIDATE_VERTEX_FILE>
 		decoded_type(u32) {};
 	};
 
-	static std::string dump(u32 &&decoded_values)
+	static std::string dump(u32 &&)
 	{
 		return "(invalidate vertex file)";
 	}
diff --git a/rpcs3/Emu/RSX/rsx_methods.h b/rpcs3/Emu/RSX/rsx_methods.h
@@ -80,7 +80,7 @@ namespace rsx
 	namespace
 	{
 		template<typename T, size_t... N, typename Args>
-		std::array<T, sizeof...(N)> fill_array(Args&& arg, std::index_sequence<N...> seq)
+		std::array<T, sizeof...(N)> fill_array(Args&& arg, std::index_sequence<N...>)
 		{
 			return{ T(N, std::forward<Args>(arg))... };
 		}

Original file line number	Diff line number	Diff line change
`@@ -4002,7 +4002,7 @@ struct registers_decoder<NV4097_NO_OPERATION>`
`4002`	`4002`	`decoded_type(u32) {};`
`4003`	`4003`	`};`
`4004`	`4004`
`4005`		`- static std::string dump(u32 &&decoded_values)`
	`4005`	`+ static std::string dump(u32 &&)`
`4006`	`4006`	`{`
`4007`	`4007`	`return "(nop)";`
`4008`	`4008`	`}`
`@@ -4016,7 +4016,7 @@ struct registers_decoder<NV4097_INVALIDATE_VERTEX_CACHE_FILE>`
`4016`	`4016`	`decoded_type(u32) {};`
`4017`	`4017`	`};`
`4018`	`4018`
`4019`		`- static std::string dump(u32 &&decoded_values)`
	`4019`	`+ static std::string dump(u32 &&)`
`4020`	`4020`	`{`
`4021`	`4021`	`return "(invalidate vertex cache file)";`
`4022`	`4022`	`}`
`@@ -4030,7 +4030,7 @@ struct registers_decoder<NV4097_INVALIDATE_VERTEX_FILE>`
`4030`	`4030`	`decoded_type(u32) {};`
`4031`	`4031`	`};`
`4032`	`4032`
`4033`		`- static std::string dump(u32 &&decoded_values)`
	`4033`	`+ static std::string dump(u32 &&)`
`4034`	`4034`	`{`
`4035`	`4035`	`return "(invalidate vertex file)";`
`4036`	`4036`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ namespace rsx`
`80`	`80`	`namespace`
`81`	`81`	`{`
`82`	`82`	`template<typename T, size_t... N, typename Args>`
`83`		`- std::array<T, sizeof...(N)> fill_array(Args&& arg, std::index_sequence<N...> seq)`
	`83`	`+ std::array<T, sizeof...(N)> fill_array(Args&& arg, std::index_sequence<N...>)`
`84`	`84`	`{`
`85`	`85`	`return{ T(N, std::forward<Args>(arg))... };`
`86`	`86`	`}`