From c0fbf3091e1917bcf23cc3592c0af0a6142bc1b9 Mon Sep 17 00:00:00 2001
From: gamerforEA <gamerforEA@gmail.com>
Date: Wed, 26 Feb 2020 20:09:45 +0400
Subject: [PATCH] Remove unnamed namespaces from headers

---
 rpcs3/Emu/RSX/Common/surface_store.h |  9 -----
 rpcs3/Emu/RSX/rsx_decode.h           | 49 +++++++++++++---------------
 rpcs3/Emu/RSX/rsx_methods.h          | 17 +++++-----
 3 files changed, 31 insertions(+), 44 deletions(-)

diff --git a/rpcs3/Emu/RSX/Common/surface_store.h b/rpcs3/Emu/RSX/Common/surface_store.h
index 71d70f87bd..8fe23b14e6 100644
--- a/rpcs3/Emu/RSX/Common/surface_store.h
+++ b/rpcs3/Emu/RSX/Common/surface_store.h
@@ -7,15 +7,6 @@
 #include "Utilities/span.h"
 #include <list>
 
-namespace
-{
-	template <typename T>
-	gsl::span<T> as_const_span(gsl::span<const std::byte> unformated_span)
-	{
-		return{ reinterpret_cast<T*>(unformated_span.data()), unformated_span.size_bytes() / sizeof(T) };
-	}
-}
-
 namespace rsx
 {
 	namespace utility
diff --git a/rpcs3/Emu/RSX/rsx_decode.h b/rpcs3/Emu/RSX/rsx_decode.h
index d3e740befe..5f8f22e45a 100644
--- a/rpcs3/Emu/RSX/rsx_decode.h
+++ b/rpcs3/Emu/RSX/rsx_decode.h
@@ -8,32 +8,6 @@
 #include "rsx_utils.h"
 #pragma warning(disable:4503)
 
-namespace
-{
-	std::string get_subreg_name(u8 subreg)
-	{
-		return subreg == 0 ? "x" :
-			subreg == 1 ? "y" :
-			subreg == 2 ? "z" :
-			"w";
-	}
-
-	std::string print_vertex_attribute_format(rsx::vertex_base_type type)
-	{
-		switch (type)
-		{
-		case rsx::vertex_base_type::s1: return "Signed short normalized";
-		case rsx::vertex_base_type::f: return "Float";
-		case rsx::vertex_base_type::sf: return "Half float";
-		case rsx::vertex_base_type::ub: return "Unsigned byte normalized";
-		case rsx::vertex_base_type::s32k: return "Signed short unormalized";
-		case rsx::vertex_base_type::cmp: return "CMP";
-		case rsx::vertex_base_type::ub256: return "Unsigned byte unormalized";
-		}
-		fmt::throw_exception("Unexpected enum found" HERE);
-	}
-}
-
 namespace rsx
 {
 	std::string print_boolean(bool b);
@@ -4150,6 +4124,14 @@ struct transform_constant_helper
 
 	static std::string dump(decoded_type &&decoded_values)
 	{
+		auto get_subreg_name = [](u8 subreg) -> std::string
+		{
+			return subreg == 0 ? "x" :
+				subreg == 1 ? "y" :
+				subreg == 2 ? "z" :
+				"w";
+		};
+		
 		return "TransformConstant[base + " + std::to_string(reg) + "]." + get_subreg_name(subreg) + " = " + std::to_string(decoded_values.constant_value());
 	}
 };
@@ -4329,6 +4311,21 @@ struct vertex_array_helper
 		if (decoded_values.size() == 0)
 			return "(disabled)";
 
+		auto print_vertex_attribute_format = [](rsx::vertex_base_type type) -> std::string
+		{
+			switch (type)
+			{
+			case rsx::vertex_base_type::s1: return "Signed short normalized";
+			case rsx::vertex_base_type::f: return "Float";
+			case rsx::vertex_base_type::sf: return "Half float";
+			case rsx::vertex_base_type::ub: return "Unsigned byte normalized";
+			case rsx::vertex_base_type::s32k: return "Signed short unormalized";
+			case rsx::vertex_base_type::cmp: return "CMP";
+			case rsx::vertex_base_type::ub256: return "Unsigned byte unormalized";
+			}
+			fmt::throw_exception("Unexpected enum found" HERE);
+		};
+		
 		return "Vertex array " + std::to_string(index) + ": Type = " + print_vertex_attribute_format(decoded_values.type()) +
 			" size = " + std::to_string(decoded_values.size()) +
 			" stride = " + std::to_string(decoded_values.stride()) +
diff --git a/rpcs3/Emu/RSX/rsx_methods.h b/rpcs3/Emu/RSX/rsx_methods.h
index c69a2b5ff1..7a941980b1 100644
--- a/rpcs3/Emu/RSX/rsx_methods.h
+++ b/rpcs3/Emu/RSX/rsx_methods.h
@@ -474,15 +474,6 @@ namespace rsx
 		}
 	};
 
-	namespace
-	{
-		template<typename T, size_t... N, typename Args>
-		std::array<T, sizeof...(N)> fill_array(Args&& arg, std::index_sequence<N...>)
-		{
-			return{ T(N, std::forward<Args>(arg))... };
-		}
-	}
-
 	struct rsx_state
 	{
 	public:
@@ -537,6 +528,14 @@ namespace rsx
 		std::array<register_vertex_data_info, 16> register_vertex_info;
 		std::array<data_array_format_info, 16> vertex_arrays_info;
 
+	private:
+		template<typename T, size_t... N, typename Args>
+		static std::array<T, sizeof...(N)> fill_array(Args&& arg, std::index_sequence<N...>)
+		{
+			return{ T(N, std::forward<Args>(arg))... };
+		}
+
+	public:
 		rsx_state() :
 			fragment_textures(fill_array<fragment_texture>(registers, std::make_index_sequence<16>())),
 			vertex_textures(fill_array<vertex_texture>(registers, std::make_index_sequence<4>())),