diff --git a/rpcs3/Emu/RSX/D3D12/D3D12FragmentProgramDecompiler.cpp b/rpcs3/Emu/RSX/D3D12/D3D12FragmentProgramDecompiler.cpp
new file mode 100644
index 0000000000..c75b9ddfff
--- /dev/null
+++ b/rpcs3/Emu/RSX/D3D12/D3D12FragmentProgramDecompiler.cpp
@@ -0,0 +1,141 @@
+#include "stdafx.h"
+#if defined(DX12_SUPPORT)
+#include "D3D12FragmentProgramDecompiler.h"
+
+#include "Utilities/Log.h"
+#include "Emu/Memory/Memory.h"
+#include "Emu/System.h"
+
+static std::string typeName[] =
+{
+	"float",
+	"float2",
+	"float3",
+	"float4"
+};
+
+static std::string functionName[] =
+{
+	"saturate",
+	"float4(dot($0.xy, $1.xy), dot($0.xy, $1.xy), dot($0.xy, $1.xy), dot($0.xy, $1.xy))",
+	"frac($0)",
+};
+
+D3D12FragmentDecompiler::D3D12FragmentDecompiler(u32 addr, u32& size, u32 ctrl) :
+	FragmentProgramDecompiler(addr, size, ctrl)
+{
+
+}
+
+void D3D12FragmentDecompiler::insertHeader(std::stringstream & OS)
+{
+	OS << "// Header" << std::endl;
+}
+
+void D3D12FragmentDecompiler::insertIntputs(std::stringstream & OS)
+{
+	OS << "struct PixelInput" << std::endl;
+	OS << "{" << std::endl;
+	OS << "	float4 Position : SV_POSITION;" << std::endl;
+	OS << "	float4 diff_color : COLOR0;" << std::endl;
+	OS << "	float4 spec_color : COLOR1;" << std::endl;
+	OS << "	float4 dst_reg3 : COLOR2;" << std::endl;
+	OS << "	float4 dst_reg4 : COLOR3;" << std::endl;
+	OS << "	float fogc : FOG;" << std::endl;
+	OS << "	float4 dummy : COLOR4;" << std::endl;
+	OS << "	float4 tc0 : TEXCOORD0;" << std::endl;
+	OS << "	float4 tc1 : TEXCOORD1;" << std::endl;
+	OS << "	float4 tc2 : TEXCOORD2;" << std::endl;
+	OS << "	float4 tc3 : TEXCOORD3;" << std::endl;
+	OS << "	float4 tc4 : TEXCOORD4;" << std::endl;
+	OS << "	float4 tc5 : TEXCOORD5;" << std::endl;
+	OS << "	float4 tc6 : TEXCOORD6;" << std::endl;
+	OS << "	float4 tc7 : TEXCOORD7;" << std::endl;
+	OS << "	float4 tc8 : TEXCOORD8;" << std::endl;
+	OS << "};" << std::endl;
+}
+
+void D3D12FragmentDecompiler::insertOutputs(std::stringstream & OS)
+{
+	OS << "struct PixelOutput" << std::endl;
+	OS << "{" << std::endl;
+	const std::pair<std::string, std::string> table[] =
+	{
+		{ "ocol0", "r0" },
+		{ "ocol1", "r2" },
+		{ "ocol2", "r3" },
+		{ "ocol3", "r4" },
+	};
+
+	for (int i = 0; i < sizeof(table) / sizeof(*table); ++i)
+	{
+		if (m_parr.HasParam(PF_PARAM_NONE, typeName[3], table[i].second))
+			OS << "	" << typeName[3] << " " << table[i].first << " : SV_TARGET" << i << ";" << std::endl;
+	}
+	OS << "};" << std::endl;
+}
+
+void D3D12FragmentDecompiler::insertConstants(std::stringstream & OS)
+{
+	OS << "cbuffer CONSTANT : register(b2)" << std::endl;
+	OS << "{" << std::endl;
+	for (ParamType PT : m_parr.params[PF_PARAM_UNIFORM])
+	{
+		if (PT.type == "sampler2D")
+			continue;
+		for (ParamItem PI : PT.items)
+			OS << "	" << PT.type << " " << PI.name << ";" << std::endl;
+	}
+	OS << "};" << std::endl << std::endl;
+	size_t textureIndex = 0;
+	for (ParamType PT : m_parr.params[PF_PARAM_UNIFORM])
+	{
+		if (PT.type != "sampler2D")
+			continue;
+		for (ParamItem PI : PT.items)
+		{
+			OS << "Texture2D " << PI.name << " : register(t" << textureIndex << ");" << std::endl;
+			OS << "sampler " << PI.name << "sampler : register(s" << textureIndex << ");" << std::endl;
+			textureIndex++;
+		}
+	}
+}
+
+void D3D12FragmentDecompiler::insertMainStart(std::stringstream & OS)
+{
+	OS << "PixelOutput main(PixelInput In)" << std::endl;
+	OS << "{" << std::endl;
+	for (ParamType PT : m_parr.params[PF_PARAM_IN])
+	{
+		for (ParamItem PI : PT.items)
+			OS << "	" << PT.type << " " << PI.name << " = In." << PI.name << ";" << std::endl;
+	}
+	// Declare output
+	for (ParamType PT : m_parr.params[PF_PARAM_NONE])
+	{
+		for (ParamItem PI : PT.items)
+			OS << "	" << PT.type << " " << PI.name << " = float4(0., 0., 0., 0.);" << std::endl;
+	}
+}
+
+void D3D12FragmentDecompiler::insertMainEnd(std::stringstream & OS)
+{
+	const std::pair<std::string, std::string> table[] =
+	{
+		{ "ocol0", "r0" },
+		{ "ocol1", "r2" },
+		{ "ocol2", "r3" },
+		{ "ocol3", "r4" },
+	};
+
+	OS << "	PixelOutput Out;" << std::endl;
+	for (int i = 0; i < sizeof(table) / sizeof(*table); ++i)
+	{
+		if (m_parr.HasParam(PF_PARAM_NONE, typeName[3], table[i].second))
+			OS << "	Out." << table[i].first << " = " << table[i].second << ";" << std::endl;
+	}
+	OS << "	return Out;" << std::endl;
+	OS << "}" << std::endl;
+}
+
+#endif
\ No newline at end of file
diff --git a/rpcs3/Emu/RSX/D3D12/D3D12FragmentProgramDecompiler.h b/rpcs3/Emu/RSX/D3D12/D3D12FragmentProgramDecompiler.h
new file mode 100644
index 0000000000..94d0985d9e
--- /dev/null
+++ b/rpcs3/Emu/RSX/D3D12/D3D12FragmentProgramDecompiler.h
@@ -0,0 +1,21 @@
+#pragma once
+#if defined(DX12_SUPPORT)
+#include "Emu/RSX/RSXFragmentProgram.h"
+#include <sstream>
+
+#include "../Common/FragmentProgramDecompiler.h"
+
+class D3D12FragmentDecompiler : public FragmentProgramDecompiler
+{
+protected:
+	virtual void insertHeader(std::stringstream &OS) override;
+	virtual void insertIntputs(std::stringstream &OS) override;
+	virtual void insertOutputs(std::stringstream &OS) override;
+	virtual void insertConstants(std::stringstream &OS) override;
+	virtual void insertMainStart(std::stringstream &OS) override;
+	virtual void insertMainEnd(std::stringstream &OS) override;
+public:
+	D3D12FragmentDecompiler(u32 addr, u32& size, u32 ctrl);
+};
+
+#endif
\ No newline at end of file
diff --git a/rpcs3/Emu/RSX/D3D12/D3D12PipelineState.h b/rpcs3/Emu/RSX/D3D12/D3D12PipelineState.h
index f8a89aa5db..60eaad2750 100644
--- a/rpcs3/Emu/RSX/D3D12/D3D12PipelineState.h
+++ b/rpcs3/Emu/RSX/D3D12/D3D12PipelineState.h
@@ -4,8 +4,8 @@
 #include <d3d12.h>
 #include <wrl/client.h>
 #include "../Common/ProgramStateCache.h"
-#include "VertexProgramDecompiler.h"
-#include "FragmentProgramDecompiler.h"
+#include "D3D12VertexProgramDecompiler.h"
+#include "D3D12FragmentProgramDecompiler.h"
 #include "Utilities/File.h"
 
 
@@ -61,7 +61,7 @@ struct D3D12Traits
 	static
 	void RecompileFragmentProgram(RSXFragmentProgram *RSXFP, FragmentProgramData& fragmentProgramData, size_t ID)
 	{
-		FragmentDecompiler FS(RSXFP->addr, RSXFP->size, RSXFP->offset);
+		D3D12FragmentDecompiler FS(RSXFP->addr, RSXFP->size, RSXFP->offset);
 		const std::string &shader = FS.Decompile();
 		fragmentProgramData.Compile(shader, Shader::SHADER_TYPE::SHADER_TYPE_FRAGMENT);
 
diff --git a/rpcs3/Emu/RSX/D3D12/VertexProgramDecompiler.cpp b/rpcs3/Emu/RSX/D3D12/D3D12VertexProgramDecompiler.cpp
similarity index 99%
rename from rpcs3/Emu/RSX/D3D12/VertexProgramDecompiler.cpp
rename to rpcs3/Emu/RSX/D3D12/D3D12VertexProgramDecompiler.cpp
index 9fc6af2b09..015307e8d6 100644
--- a/rpcs3/Emu/RSX/D3D12/VertexProgramDecompiler.cpp
+++ b/rpcs3/Emu/RSX/D3D12/D3D12VertexProgramDecompiler.cpp
@@ -1,6 +1,6 @@
 #include "stdafx.h"
 #if defined(DX12_SUPPORT)
-#include "VertexProgramDecompiler.h"
+#include "D3D12VertexProgramDecompiler.h"
 
 #include "Utilities/Log.h"
 #include "Emu/System.h"
diff --git a/rpcs3/Emu/RSX/D3D12/VertexProgramDecompiler.h b/rpcs3/Emu/RSX/D3D12/D3D12VertexProgramDecompiler.h
similarity index 98%
rename from rpcs3/Emu/RSX/D3D12/VertexProgramDecompiler.h
rename to rpcs3/Emu/RSX/D3D12/D3D12VertexProgramDecompiler.h
index 7fcbc97a30..11195bdf41 100644
--- a/rpcs3/Emu/RSX/D3D12/VertexProgramDecompiler.h
+++ b/rpcs3/Emu/RSX/D3D12/D3D12VertexProgramDecompiler.h
@@ -3,7 +3,7 @@
 #include "Emu/RSX/RSXVertexProgram.h"
 #include <vector>
 #include <sstream>
-#include "ShaderParam.h"
+#include "../Common/ShaderParam.h"
 
 struct VertexDecompiler
 {
diff --git a/rpcs3/Emu/RSX/D3D12/FragmentProgramDecompiler.cpp b/rpcs3/Emu/RSX/D3D12/FragmentProgramDecompiler.cpp
deleted file mode 100644
index 765d026b98..0000000000
--- a/rpcs3/Emu/RSX/D3D12/FragmentProgramDecompiler.cpp
+++ /dev/null
@@ -1,753 +0,0 @@
-#include "stdafx.h"
-#if defined(DX12_SUPPORT)
-#include "FragmentProgramDecompiler.h"
-
-#include "Utilities/Log.h"
-#include "Emu/Memory/Memory.h"
-#include "Emu/System.h"
-
-static std::string typeName[] =
-{
-	"float",
-	"float2",
-	"float3",
-	"float4"
-};
-
-enum FUNCTION {
-	FUNCTION_SATURATE,
-	FUNCTION_DP2,
-	FUNCTION_FRACT,
-};
-
-static std::string functionName[] =
-{
-	"saturate",
-	"float4(dot($0.xy, $1.xy), dot($0.xy, $1.xy), dot($0.xy, $1.xy), dot($0.xy, $1.xy))",
-	"frac($0)",
-};
-
-FragmentDecompiler::FragmentDecompiler(u32 addr, u32& size, u32 ctrl) :
-	m_addr(addr),
-	m_size(size),
-	m_const_index(0),
-	m_location(0),
-	m_ctrl(ctrl)
-{
-	m_size = 0;
-}
-
-
-void FragmentDecompiler::SetDst(std::string code, bool append_mask)
-{
-	if (!src0.exec_if_eq && !src0.exec_if_gr && !src0.exec_if_lt) return;
-
-	switch (src1.scale)
-	{
-	case 0: break;
-	case 1: code = "(" + code + " * 2.0)"; break;
-	case 2: code = "(" + code + " * 4.0)"; break;
-	case 3: code = "(" + code + " * 8.0)"; break;
-	case 5: code = "(" + code + " / 2.0)"; break;
-	case 6: code = "(" + code + " / 4.0)"; break;
-	case 7: code = "(" + code + " / 8.0)"; break;
-
-	default:
-		LOG_ERROR(RSX, "Bad scale: %d", fmt::by_value(src1.scale));
-		Emu.Pause();
-		break;
-	}
-
-	if (dst.saturate)
-	{
-		code = functionName[FUNCTION_SATURATE] + "(" + code + ")";
-	}
-
-	code += (append_mask ? "$m" : "");
-
-	if (dst.no_dest)
-	{
-		if (dst.set_cond)
-		{
-			AddCode("$ifcond " + m_parr.AddParam(PF_PARAM_NONE, typeName[3], "cc" + std::to_string(src0.cond_mod_reg_index)) + "$m = " + code + ";");
-		}
-		else
-		{
-			AddCode("$ifcond " + code + ";");
-		}
-
-		return;
-	}
-
-	std::string dest = AddReg(dst.dest_reg, dst.fp16) + "$m";
-
-	AddCodeCond(Format(dest), code);
-	//AddCode("$ifcond " + dest + code + (append_mask ? "$m;" : ";"));
-
-	if (dst.set_cond)
-	{
-		AddCode(m_parr.AddParam(PF_PARAM_NONE, typeName[3], "cc" + std::to_string(src0.cond_mod_reg_index)) + "$m = " + dest + ";");
-	}
-}
-
-void FragmentDecompiler::AddCode(const std::string& code)
-{
-	main.append(m_code_level, '\t') += Format(code) + "\n";
-}
-
-std::string FragmentDecompiler::GetMask()
-{
-	std::string ret;
-
-	static const char dst_mask[4] =
-	{
-		'x', 'y', 'z', 'w',
-	};
-
-	if (dst.mask_x) ret += dst_mask[0];
-	if (dst.mask_y) ret += dst_mask[1];
-	if (dst.mask_z) ret += dst_mask[2];
-	if (dst.mask_w) ret += dst_mask[3];
-
-	return ret.empty() || strncmp(ret.c_str(), dst_mask, 4) == 0 ? "" : ("." + ret);
-}
-
-std::string FragmentDecompiler::AddReg(u32 index, int fp16)
-{
-	return m_parr.AddParam(PF_PARAM_NONE, typeName[3], std::string(fp16 ? "h" : "r") + std::to_string(index), typeName[3] + "(0.0)");
-}
-
-bool FragmentDecompiler::HasReg(u32 index, int fp16)
-{
-	return m_parr.HasParam(PF_PARAM_NONE, typeName[3],
-		std::string(fp16 ? "h" : "r") + std::to_string(index));
-}
-
-std::string FragmentDecompiler::AddCond()
-{
-	return m_parr.AddParam(PF_PARAM_NONE, typeName[3], "cc" + std::to_string(src0.cond_reg_index));
-}
-
-std::string FragmentDecompiler::AddConst()
-{
-	std::string name = std::string("fc") + std::to_string(m_size + 4 * 4);
-	if (m_parr.HasParam(PF_PARAM_UNIFORM, typeName[3], name))
-	{
-		return name;
-	}
-
-	auto data = vm::ptr<u32>::make(m_addr + m_size + 4 * sizeof(u32));
-
-	m_offset = 2 * 4 * sizeof(u32);
-	u32 x = GetData(data[0]);
-	u32 y = GetData(data[1]);
-	u32 z = GetData(data[2]);
-	u32 w = GetData(data[3]);
-	return m_parr.AddParam(PF_PARAM_UNIFORM, typeName[3], name,
-		std::string(typeName[3] + "(") + std::to_string((float&)x) + ", " + std::to_string((float&)y)
-		+ ", " + std::to_string((float&)z) + ", " + std::to_string((float&)w) + ")");
-}
-
-std::string FragmentDecompiler::AddTex()
-{
-	return m_parr.AddParam(PF_PARAM_UNIFORM, "sampler2D", std::string("tex") + std::to_string(dst.tex_num));
-}
-
-std::string FragmentDecompiler::Format(const std::string& code)
-{
-	const std::pair<std::string, std::function<std::string()>> repl_list[] =
-	{
-		{ "$$", []() -> std::string { return "$"; } },
-		{ "$0", [this]() -> std::string {return GetSRC<SRC0>(src0);} },//std::bind(std::mem_fn(&GLFragmentDecompilerThread::GetSRC<SRC0>), *this, src0) },
-		{ "$1", [this]() -> std::string {return GetSRC<SRC1>(src1);} },//std::bind(std::mem_fn(&GLFragmentDecompilerThread::GetSRC<SRC1>), this, src1) },
-		{ "$2", [this]() -> std::string {return GetSRC<SRC2>(src2);} },//std::bind(std::mem_fn(&GLFragmentDecompilerThread::GetSRC<SRC2>), this, src2) },
-		{ "$t", std::bind(std::mem_fn(&FragmentDecompiler::AddTex), this) },
-		{ "$m", std::bind(std::mem_fn(&FragmentDecompiler::GetMask), this) },
-		{ "$ifcond ", [this]() -> std::string
-	{
-		const std::string& cond = GetCond();
-		if (cond == "true") return "";
-		return "if(" + cond + ") ";
-	}
-		},
-		{ "$cond", std::bind(std::mem_fn(&FragmentDecompiler::GetCond), this) },
-		{ "$c", std::bind(std::mem_fn(&FragmentDecompiler::AddConst), this) }
-	};
-
-	return fmt::replace_all(code, repl_list);
-}
-
-std::string FragmentDecompiler::GetCond()
-{
-	if (src0.exec_if_gr && src0.exec_if_lt && src0.exec_if_eq)
-	{
-		return "true";
-	}
-	else if (!src0.exec_if_gr && !src0.exec_if_lt && !src0.exec_if_eq)
-	{
-		return "false";
-	}
-
-	static const char f[4] = { 'x', 'y', 'z', 'w' };
-
-	std::string swizzle, cond;
-	swizzle += f[src0.cond_swizzle_x];
-	swizzle += f[src0.cond_swizzle_y];
-	swizzle += f[src0.cond_swizzle_z];
-	swizzle += f[src0.cond_swizzle_w];
-	swizzle = swizzle == "xyzw" ? "" : "." + swizzle;
-
-	if (src0.exec_if_gr && src0.exec_if_eq)
-	{
-		cond = "greaterThanEqual";
-	}
-	else if (src0.exec_if_lt && src0.exec_if_eq)
-	{
-		cond = "lessThanEqual";
-	}
-	else if (src0.exec_if_gr && src0.exec_if_lt)
-	{
-		cond = "notEqual";
-	}
-	else if (src0.exec_if_gr)
-	{
-		cond = "greaterThan";
-	}
-	else if (src0.exec_if_lt)
-	{
-		cond = "lessThan";
-	}
-	else //if(src0.exec_if_eq)
-	{
-		cond = "equal";
-	}
-
-	return "any(" + cond + "(" + AddCond() + swizzle + ", " + typeName[3] +"(0.0)))";
-}
-
-void FragmentDecompiler::AddCodeCond(const std::string& dst, const std::string& src)
-{
-	if (src0.exec_if_gr && src0.exec_if_lt && src0.exec_if_eq)
-	{
-		AddCode(dst + " = " + src + ";");
-		return;
-	}
-
-	if (!src0.exec_if_gr && !src0.exec_if_lt && !src0.exec_if_eq)
-	{
-		AddCode("//" + dst + " = " + src + ";");
-		return;
-	}
-
-	static const char f[4] = { 'x', 'y', 'z', 'w' };
-
-	std::string swizzle, cond;
-	swizzle += f[src0.cond_swizzle_x];
-	swizzle += f[src0.cond_swizzle_y];
-	swizzle += f[src0.cond_swizzle_z];
-	swizzle += f[src0.cond_swizzle_w];
-	swizzle = swizzle == "xyzw" ? "" : "." + swizzle;
-
-	if (src0.exec_if_gr && src0.exec_if_eq)
-	{
-		cond = ">=";
-	}
-	else if (src0.exec_if_lt && src0.exec_if_eq)
-	{
-		cond = "<=";
-	}
-	else if (src0.exec_if_gr && src0.exec_if_lt)
-	{
-		cond = "!=";
-	}
-	else if (src0.exec_if_gr)
-	{
-		cond = ">";
-	}
-	else if (src0.exec_if_lt)
-	{
-		cond = "<";
-	}
-	else //if(src0.exec_if_eq)
-	{
-		cond = "==";
-	}
-
-	cond = "(" + AddCond() + swizzle + " " + cond + " " + typeName[3] + "(0., 0., 0., 0.))";
-
-	ShaderVariable dst_var(dst);
-	dst_var.symplify();
-
-	//const char *c_mask = f;
-
-	if (dst_var.swizzles[0].length() == 1)
-	{
-		AddCode("if (" + cond + ".x) " + dst + " = " + src + ";");
-	}
-	else
-	{
-		for (int i = 0; i < dst_var.swizzles[0].length(); ++i)
-		{
-			AddCode("if (" + cond + "." + f[i] + ") " + dst + "." + f[i] + " = " + src + "." + f[i] + ";");
-		}
-	}
-}
-
-template<typename T> std::string FragmentDecompiler::GetSRC(T src)
-{
-	std::string ret;
-
-	switch (src.reg_type)
-	{
-	case 0: //tmp
-		ret += AddReg(src.tmp_reg_index, src.fp16);
-		break;
-
-	case 1: //input
-	{
-		static const std::string reg_table[] =
-		{
-			"gl_Position",
-			"diff_color", "spec_color",
-			"fogc",
-			"tc0", "tc1", "tc2", "tc3", "tc4", "tc5", "tc6", "tc7", "tc8", "tc9",
-			"ssa"
-		};
-
-		switch (dst.src_attr_reg_num)
-		{
-		case 0x00: ret += reg_table[0]; break;
-		default:
-			if (dst.src_attr_reg_num < sizeof(reg_table) / sizeof(reg_table[0]))
-			{
-				ret += m_parr.AddParam(PF_PARAM_IN, typeName[3], reg_table[dst.src_attr_reg_num]);
-			}
-			else
-			{
-				LOG_ERROR(RSX, "Bad src reg num: %d", fmt::by_value(dst.src_attr_reg_num));
-				ret += m_parr.AddParam(PF_PARAM_IN, typeName[3], "unk");
-				Emu.Pause();
-			}
-			break;
-		}
-	}
-	break;
-
-	case 2: //const
-		ret += AddConst();
-		break;
-
-	default:
-		LOG_ERROR(RSX, "Bad src type %d", fmt::by_value(src.reg_type));
-		Emu.Pause();
-		break;
-	}
-
-	static const char f[4] = { 'x', 'y', 'z', 'w' };
-
-	std::string swizzle = "";
-	swizzle += f[src.swizzle_x];
-	swizzle += f[src.swizzle_y];
-	swizzle += f[src.swizzle_z];
-	swizzle += f[src.swizzle_w];
-
-	if (strncmp(swizzle.c_str(), f, 4) != 0) ret += "." + swizzle;
-
-	if (src.abs) ret = "abs(" + ret + ")";
-	if (src.neg) ret = "-" + ret;
-
-	return ret;
-}
-
-std::string FragmentDecompiler::BuildCode()
-{
-	//main += fmt::Format("\tgl_FragColor = %c0;\n", m_ctrl & 0x40 ? 'r' : 'h');
-
-	if (m_ctrl & 0xe) main += m_ctrl & 0x40 ? "\tgl_FragDepth = r1.z;\n" : "\tgl_FragDepth = h2.z;\n";
-
-	std::stringstream OS;
-	insertHeader(OS);
-	OS << std::endl;
-	insertConstants(OS);
-	OS << std::endl;
-	insertIntputs(OS);
-	OS << std::endl;
-	insertOutputs(OS);
-	OS << std::endl;
-	insertMainStart(OS);
-	OS << main << std::endl;
-	insertMainEnd(OS);
-
-	return OS.str();
-}
-
-void FragmentDecompiler::insertHeader(std::stringstream & OS)
-{
-	OS << "// Header" << std::endl;
-}
-
-void FragmentDecompiler::insertIntputs(std::stringstream & OS)
-{
-	OS << "struct PixelInput" << std::endl;
-	OS << "{" << std::endl;
-	OS << "	float4 Position : SV_POSITION;" << std::endl;
-	OS << "	float4 diff_color : COLOR0;" << std::endl;
-	OS << "	float4 spec_color : COLOR1;" << std::endl;
-	OS << "	float4 dst_reg3 : COLOR2;" << std::endl;
-	OS << "	float4 dst_reg4 : COLOR3;" << std::endl;
-	OS << "	float fogc : FOG;" << std::endl;
-	OS << "	float4 dummy : COLOR4;" << std::endl;
-	OS << "	float4 tc0 : TEXCOORD0;" << std::endl;
-	OS << "	float4 tc1 : TEXCOORD1;" << std::endl;
-	OS << "	float4 tc2 : TEXCOORD2;" << std::endl;
-	OS << "	float4 tc3 : TEXCOORD3;" << std::endl;
-	OS << "	float4 tc4 : TEXCOORD4;" << std::endl;
-	OS << "	float4 tc5 : TEXCOORD5;" << std::endl;
-	OS << "	float4 tc6 : TEXCOORD6;" << std::endl;
-	OS << "	float4 tc7 : TEXCOORD7;" << std::endl;
-	OS << "	float4 tc8 : TEXCOORD8;" << std::endl;
-	OS << "};" << std::endl;
-}
-
-void FragmentDecompiler::insertOutputs(std::stringstream & OS)
-{
-	OS << "struct PixelOutput" << std::endl;
-	OS << "{" << std::endl;
-	const std::pair<std::string, std::string> table[] =
-	{
-		{ "ocol0", "r0" },
-		{ "ocol1", "r2" },
-		{ "ocol2", "r3" },
-		{ "ocol3", "r4" },
-	};
-
-	for (int i = 0; i < sizeof(table) / sizeof(*table); ++i)
-	{
-		if (m_parr.HasParam(PF_PARAM_NONE, typeName[3], table[i].second))
-			OS << "	" << typeName[3] << " " << table[i].first << " : SV_TARGET" << i << ";" << std::endl;
-	}
-	OS << "};" << std::endl;
-}
-
-void FragmentDecompiler::insertConstants(std::stringstream & OS)
-{
-	OS << "cbuffer CONSTANT : register(b2)" << std::endl;
-	OS << "{" << std::endl;
-	for (ParamType PT : m_parr.params[PF_PARAM_UNIFORM])
-	{
-		if (PT.type == "sampler2D")
-			continue;
-		for (ParamItem PI : PT.items)
-			OS << "	" << PT.type << " " << PI.name << ";" << std::endl;
-	}
-	OS << "};" << std::endl << std::endl;
-	size_t textureIndex = 0;
-	for (ParamType PT : m_parr.params[PF_PARAM_UNIFORM])
-	{
-		if (PT.type != "sampler2D")
-			continue;
-		for (ParamItem PI : PT.items)
-		{
-			OS << "Texture2D " << PI.name << " : register(t" << textureIndex << ");" << std::endl;
-			OS << "sampler " << PI.name << "sampler : register(s" << textureIndex << ");" << std::endl;
-			textureIndex++;
-		}
-	}
-}
-
-void FragmentDecompiler::insertMainStart(std::stringstream & OS)
-{
-	OS << "PixelOutput main(PixelInput In)" << std::endl;
-	OS << "{" << std::endl;
-	for (ParamType PT : m_parr.params[PF_PARAM_IN])
-	{
-		for (ParamItem PI : PT.items)
-			OS << "	" << PT.type << " " << PI.name << " = In." << PI.name << ";" << std::endl;
-	}
-	// Declare output
-	for (ParamType PT : m_parr.params[PF_PARAM_NONE])
-	{
-		for (ParamItem PI : PT.items)
-			OS << "	" << PT.type << " " << PI.name << " = float4(0., 0., 0., 0.);" << std::endl;
-	}
-}
-
-void FragmentDecompiler::insertMainEnd(std::stringstream & OS)
-{
-	const std::pair<std::string, std::string> table[] =
-	{
-		{ "ocol0", "r0" },
-		{ "ocol1", "r2" },
-		{ "ocol2", "r3" },
-		{ "ocol3", "r4" },
-	};
-
-	OS << "	PixelOutput Out;" << std::endl;
-	for (int i = 0; i < sizeof(table) / sizeof(*table); ++i)
-	{
-		if (m_parr.HasParam(PF_PARAM_NONE, typeName[3], table[i].second))
-			OS << "	Out." << table[i].first << " = " << table[i].second << ";" << std::endl;
-	}
-	OS << "	return Out;" << std::endl;
-	OS << "}" << std::endl;
-}
-
-std::string FragmentDecompiler::Decompile()
-{
-	auto data = vm::ptr<u32>::make(m_addr);
-	m_size = 0;
-	m_location = 0;
-	m_loop_count = 0;
-	m_code_level = 1;
-
-	enum
-	{
-		FORCE_NONE,
-		FORCE_SCT,
-		FORCE_SCB,
-	};
-
-	int forced_unit = FORCE_NONE;
-
-	while (true)
-	{
-		for (auto finded = std::find(m_end_offsets.begin(), m_end_offsets.end(), m_size);
-		finded != m_end_offsets.end();
-			finded = std::find(m_end_offsets.begin(), m_end_offsets.end(), m_size))
-		{
-			m_end_offsets.erase(finded);
-			m_code_level--;
-			AddCode("}");
-			m_loop_count--;
-		}
-
-		for (auto finded = std::find(m_else_offsets.begin(), m_else_offsets.end(), m_size);
-		finded != m_else_offsets.end();
-			finded = std::find(m_else_offsets.begin(), m_else_offsets.end(), m_size))
-		{
-			m_else_offsets.erase(finded);
-			m_code_level--;
-			AddCode("}");
-			AddCode("else");
-			AddCode("{");
-			m_code_level++;
-		}
-
-		dst.HEX = GetData(data[0]);
-		src0.HEX = GetData(data[1]);
-		src1.HEX = GetData(data[2]);
-		src2.HEX = GetData(data[3]);
-
-		m_offset = 4 * sizeof(u32);
-
-		const u32 opcode = dst.opcode | (src1.opcode_is_branch << 6);
-
-		auto SCT = [&]()
-		{
-			switch (opcode)
-			{
-			case RSX_FP_OPCODE_ADD: SetDst("($0 + $1)"); break;
-			case RSX_FP_OPCODE_DIV: SetDst("($0 / $1)"); break;
-			case RSX_FP_OPCODE_DIVSQ: SetDst("($0 / sqrt($1))"); break;
-			case RSX_FP_OPCODE_DP2: SetDst(functionName[FUNCTION_DP2]); break;
-			case RSX_FP_OPCODE_DP3: SetDst("vec4(dot($0.xyz, $1.xyz))"); break;
-			case RSX_FP_OPCODE_DP4: SetDst("vec4(dot($0, $1))"); break;
-			case RSX_FP_OPCODE_DP2A: SetDst("vec4($0.x * $1.x + $0.y * $1.y + $2.x)"); break;
-			case RSX_FP_OPCODE_MAD: SetDst("($0 * $1 + $2)"); break;
-			case RSX_FP_OPCODE_MAX: SetDst("max($0, $1)"); break;
-			case RSX_FP_OPCODE_MIN: SetDst("min($0, $1)"); break;
-			case RSX_FP_OPCODE_MOV: SetDst("$0"); break;
-			case RSX_FP_OPCODE_MUL: SetDst("($0 * $1)"); break;
-			case RSX_FP_OPCODE_RCP: SetDst("1 / $0"); break;
-			case RSX_FP_OPCODE_RSQ: SetDst("inversesqrt(abs($0))"); break;
-			case RSX_FP_OPCODE_SEQ: SetDst("vec4(equal($0, $1))"); break;
-			case RSX_FP_OPCODE_SFL: SetDst("vec4(0.0)"); break;
-			case RSX_FP_OPCODE_SGE: SetDst("vec4(greaterThanEqual($0, $1))"); break;
-			case RSX_FP_OPCODE_SGT: SetDst("vec4(greaterThan($0, $1))"); break;
-			case RSX_FP_OPCODE_SLE: SetDst("vec4(lessThanEqual($0, $1))"); break;
-			case RSX_FP_OPCODE_SLT: SetDst("vec4(lessThan($0, $1))"); break;
-			case RSX_FP_OPCODE_SNE: SetDst("vec4(notEqual($0, $1))"); break;
-			case RSX_FP_OPCODE_STR: SetDst("vec4(1.0)"); break;
-
-			default:
-				return false;
-			}
-
-			return true;
-		};
-
-		auto SCB = [&]()
-		{
-			switch (opcode)
-			{
-			case RSX_FP_OPCODE_ADD: SetDst("($0 + $1)"); break;
-			case RSX_FP_OPCODE_COS: SetDst("cos($0)"); break;
-			case RSX_FP_OPCODE_DP2: SetDst("dot($0.xy, $1.xy).xxxx"); break;
-			case RSX_FP_OPCODE_DP3: SetDst("dot($0.xyz, $1.xyz).xxxx"); break;
-			case RSX_FP_OPCODE_DP4: SetDst("dot($0, $1).xxxx"); break;
-			case RSX_FP_OPCODE_DP2A: SetDst("vec4($0.x * $1.x + $0.y * $1.y + $2.x)"); break;
-			case RSX_FP_OPCODE_DST: SetDst("vec4(distance($0, $1))"); break;
-			case RSX_FP_OPCODE_REFL: LOG_ERROR(RSX, "Unimplemented SCB instruction: REFL"); break; // TODO: Is this in the right category?
-			case RSX_FP_OPCODE_EX2: SetDst("exp2($0)"); break;
-			case RSX_FP_OPCODE_FLR: SetDst("floor($0)"); break;
-			case RSX_FP_OPCODE_FRC: SetDst(functionName[FUNCTION_FRACT]); break;
-			case RSX_FP_OPCODE_LIT: SetDst("vec4(1.0, $0.x, ($0.x > 0.0 ? exp($0.w * log2($0.y)) : 0.0), 1.0)"); break;
-			case RSX_FP_OPCODE_LIF: SetDst("vec4(1.0, $0.y, ($0.y > 0 ? pow(2.0, $0.w) : 0.0), 1.0)"); break;
-			case RSX_FP_OPCODE_LRP: LOG_ERROR(RSX, "Unimplemented SCB instruction: LRP"); break; // TODO: Is this in the right category?
-			case RSX_FP_OPCODE_LG2: SetDst("log2($0)"); break;
-			case RSX_FP_OPCODE_MAD: SetDst("($0 * $1 + $2)"); break;
-			case RSX_FP_OPCODE_MAX: SetDst("max($0, $1)"); break;
-			case RSX_FP_OPCODE_MIN: SetDst("min($0, $1)"); break;
-			case RSX_FP_OPCODE_MOV: SetDst("$0"); break;
-			case RSX_FP_OPCODE_MUL: SetDst("($0 * $1)"); break;
-			case RSX_FP_OPCODE_PK2: SetDst("packSnorm2x16($0)"); break; // TODO: More testing (Sonic The Hedgehog (NPUB-30442/NPEB-00478))
-			case RSX_FP_OPCODE_PK4: SetDst("packSnorm4x8($0)"); break; // TODO: More testing (Sonic The Hedgehog (NPUB-30442/NPEB-00478))
-			case RSX_FP_OPCODE_PK16: LOG_ERROR(RSX, "Unimplemented SCB instruction: PK16"); break;
-			case RSX_FP_OPCODE_PKB: LOG_ERROR(RSX, "Unimplemented SCB instruction: PKB"); break;
-			case RSX_FP_OPCODE_PKG: LOG_ERROR(RSX, "Unimplemented SCB instruction: PKG"); break;
-			case RSX_FP_OPCODE_SEQ: SetDst("vec4(equal($0, $1))"); break;
-			case RSX_FP_OPCODE_SFL: SetDst("vec4(0.0)"); break;
-			case RSX_FP_OPCODE_SGE: SetDst("vec4(greaterThanEqual($0, $1))"); break;
-			case RSX_FP_OPCODE_SGT: SetDst("vec4(greaterThan($0, $1))"); break;
-			case RSX_FP_OPCODE_SIN: SetDst("sin($0)"); break;
-			case RSX_FP_OPCODE_SLE: SetDst("vec4(lessThanEqual($0, $1))"); break;
-			case RSX_FP_OPCODE_SLT: SetDst("vec4(lessThan($0, $1))"); break;
-			case RSX_FP_OPCODE_SNE: SetDst("vec4(notEqual($0, $1))"); break;
-			case RSX_FP_OPCODE_STR: SetDst("vec4(1.0)"); break;
-
-			default:
-				return false;
-			}
-
-			return true;
-		};
-
-		auto TEX_SRB = [&]()
-		{
-			switch (opcode)
-			{
-			case RSX_FP_OPCODE_DDX: SetDst("dFdx($0)"); break;
-			case RSX_FP_OPCODE_DDY: SetDst("dFdy($0)"); break;
-			case RSX_FP_OPCODE_NRM: SetDst("normalize($0)"); break;
-			case RSX_FP_OPCODE_BEM: LOG_ERROR(RSX, "Unimplemented TEX_SRB instruction: BEM"); break;
-			case RSX_FP_OPCODE_TEX: SetDst("$t.Sample($tsampler, $0.xy)");  break;
-			case RSX_FP_OPCODE_TEXBEM: SetDst("texture($t, $0.xy, $1.x)"); break;
-			case RSX_FP_OPCODE_TXP: SetDst("textureProj($t, $0.xyz, $1.x)"); break; //TODO: More testing (Sonic The Hedgehog (NPUB-30442/NPEB-00478) and The Simpsons Arcade Game (NPUB30563))
-			case RSX_FP_OPCODE_TXPBEM: SetDst("textureProj($t, $0.xyz, $1.x)"); break;
-			case RSX_FP_OPCODE_TXD: LOG_ERROR(RSX, "Unimplemented TEX_SRB instruction: TXD"); break;
-			case RSX_FP_OPCODE_TXB: SetDst("texture($t, $0.xy, $1.x)"); break;
-			case RSX_FP_OPCODE_TXL: SetDst("textureLod($t, $0.xy, $1.x)"); break;
-			case RSX_FP_OPCODE_UP2: SetDst("unpackSnorm2x16($0)"); break; // TODO: More testing (Sonic The Hedgehog (NPUB-30442/NPEB-00478))
-			case RSX_FP_OPCODE_UP4: SetDst("unpackSnorm4x8($0)"); break; // TODO: More testing (Sonic The Hedgehog (NPUB-30442/NPEB-00478))
-			case RSX_FP_OPCODE_UP16: LOG_ERROR(RSX, "Unimplemented TEX_SRB instruction: UP16"); break;
-			case RSX_FP_OPCODE_UPB: LOG_ERROR(RSX, "Unimplemented TEX_SRB instruction: UPB"); break;
-			case RSX_FP_OPCODE_UPG: LOG_ERROR(RSX, "Unimplemented TEX_SRB instruction: UPG"); break;
-
-			default:
-				return false;
-			}
-
-			return true;
-		};
-
-		auto SIP = [&]()
-		{
-			switch (opcode)
-			{
-			case RSX_FP_OPCODE_BRK: SetDst("break"); break;
-			case RSX_FP_OPCODE_CAL: LOG_ERROR(RSX, "Unimplemented SIP instruction: CAL"); break;
-			case RSX_FP_OPCODE_FENCT: forced_unit = FORCE_SCT; break;
-			case RSX_FP_OPCODE_FENCB: forced_unit = FORCE_SCB; break;
-			case RSX_FP_OPCODE_IFE:
-				AddCode("if($cond)");
-				m_else_offsets.push_back(src1.else_offset << 2);
-				m_end_offsets.push_back(src2.end_offset << 2);
-				AddCode("{");
-				m_code_level++;
-				break;
-			case RSX_FP_OPCODE_LOOP:
-				if (!src0.exec_if_eq && !src0.exec_if_gr && !src0.exec_if_lt)
-				{
-					AddCode(fmt::Format("$ifcond for(int i%u = %u; i%u < %u; i%u += %u) {} //-> %u //LOOP",
-						m_loop_count, src1.init_counter, m_loop_count, src1.end_counter, m_loop_count, src1.increment, src2.end_offset));
-				}
-				else
-				{
-					AddCode(fmt::Format("$ifcond for(int i%u = %u; i%u < %u; i%u += %u) //LOOP",
-						m_loop_count, src1.init_counter, m_loop_count, src1.end_counter, m_loop_count, src1.increment));
-					m_loop_count++;
-					m_end_offsets.push_back(src2.end_offset << 2);
-					AddCode("{");
-					m_code_level++;
-				}
-				break;
-			case RSX_FP_OPCODE_REP:
-				if (!src0.exec_if_eq && !src0.exec_if_gr && !src0.exec_if_lt)
-				{
-					AddCode(fmt::Format("$ifcond for(int i%u = %u; i%u < %u; i%u += %u) {} //-> %u //REP",
-						m_loop_count, src1.init_counter, m_loop_count, src1.end_counter, m_loop_count, src1.increment, src2.end_offset));
-				}
-				else
-				{
-					AddCode(fmt::Format("if($cond) for(int i%u = %u; i%u < %u; i%u += %u) //REP",
-						m_loop_count, src1.init_counter, m_loop_count, src1.end_counter, m_loop_count, src1.increment));
-					m_loop_count++;
-					m_end_offsets.push_back(src2.end_offset << 2);
-					AddCode("{");
-					m_code_level++;
-				}
-				break;
-			case RSX_FP_OPCODE_RET: SetDst("return"); break;
-
-			default:
-				return false;
-			}
-
-			return true;
-		};
-
-		switch (opcode)
-		{
-		case RSX_FP_OPCODE_NOP: break;
-		case RSX_FP_OPCODE_KIL: SetDst("discard", false); break;
-
-		default:
-			if (forced_unit == FORCE_NONE)
-			{
-				if (SIP()) break;
-				if (SCT()) break;
-				if (TEX_SRB()) break;
-				if (SCB()) break;
-			}
-			else if (forced_unit == FORCE_SCT)
-			{
-				forced_unit = FORCE_NONE;
-				if (SCT()) break;
-			}
-			else if (forced_unit == FORCE_SCB)
-			{
-				forced_unit = FORCE_NONE;
-				if (SCB()) break;
-			}
-
-			LOG_ERROR(RSX, "Unknown/illegal instruction: 0x%x (forced unit %d)", opcode, forced_unit);
-			break;
-		}
-
-		m_size += m_offset;
-
-		if (dst.end) break;
-
-		assert(m_offset % sizeof(u32) == 0);
-		data += m_offset / sizeof(u32);
-	}
-
-	// flush m_code_level
-	m_code_level = 1;
-	std::string m_shader = BuildCode();
-	main.clear();
-//	m_parr.params.clear();
-	return m_shader;
-}
-
-#endif
\ No newline at end of file
diff --git a/rpcs3/Emu/RSX/D3D12/FragmentProgramDecompiler.h b/rpcs3/Emu/RSX/D3D12/FragmentProgramDecompiler.h
deleted file mode 100644
index c0642a2051..0000000000
--- a/rpcs3/Emu/RSX/D3D12/FragmentProgramDecompiler.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#pragma once
-#if defined(DX12_SUPPORT)
-#include "ShaderParam.h"
-#include "Emu/RSX/RSXFragmentProgram.h"
-#include <sstream>
-
-class FragmentDecompiler
-{
-	std::string main;
-	u32 m_addr;
-	u32& m_size;
-	u32 m_const_index;
-	u32 m_offset;
-	u32 m_location;
-	u32 m_ctrl;
-	u32 m_loop_count;
-	int m_code_level;
-	std::vector<u32> m_end_offsets;
-	std::vector<u32> m_else_offsets;
-
-	std::string GetMask();
-
-	void SetDst(std::string code, bool append_mask = true);
-	void AddCode(const std::string& code);
-	std::string AddReg(u32 index, int fp16);
-	bool HasReg(u32 index, int fp16);
-	std::string AddCond();
-	std::string AddConst();
-	std::string AddTex();
-	std::string Format(const std::string& code);
-
-	void AddCodeCond(const std::string& dst, const std::string& src);
-	std::string GetCond();
-	template<typename T> std::string GetSRC(T src);
-	std::string BuildCode();
-
-	u32 GetData(const u32 d) const { return d << 16 | d >> 16; }
-protected:
-	virtual void insertHeader(std::stringstream &OS);
-	virtual void insertIntputs(std::stringstream &OS);
-	virtual void insertOutputs(std::stringstream &OS);
-	virtual void insertConstants(std::stringstream &OS);
-	virtual void insertMainStart(std::stringstream &OS);
-	virtual void insertMainEnd(std::stringstream &OS);
-public:
-	ParamArray m_parr;
-	FragmentDecompiler(u32 addr, u32& size, u32 ctrl);
-	std::string Decompile();
-};
-
-#endif
\ No newline at end of file
diff --git a/rpcs3/Emu/RSX/D3D12/ShaderParam.cpp b/rpcs3/Emu/RSX/D3D12/ShaderParam.cpp
deleted file mode 100644
index a28d9bf21b..0000000000
--- a/rpcs3/Emu/RSX/D3D12/ShaderParam.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#include "stdafx.h"
-#if defined(DX12_SUPPORT)
-#include "ShaderParam.h"
-
-
-#endif
\ No newline at end of file
diff --git a/rpcs3/Emu/RSX/D3D12/ShaderParam.h b/rpcs3/Emu/RSX/D3D12/ShaderParam.h
deleted file mode 100644
index c063a9e793..0000000000
--- a/rpcs3/Emu/RSX/D3D12/ShaderParam.h
+++ /dev/null
@@ -1,194 +0,0 @@
-#pragma once
-#if defined(DX12_SUPPORT)
-#include <string>
-#include <vector>
-
-enum ParamFlag
-{
-	PF_PARAM_IN,
-	PF_PARAM_OUT,
-	PF_PARAM_UNIFORM,
-	PF_PARAM_CONST,
-	PF_PARAM_NONE,
-	PF_PARAM_COUNT,
-};
-
-struct ParamItem
-{
-	std::string name;
-	std::string value;
-	int location;
-
-	ParamItem(const std::string& _name, int _location, const std::string& _value = "")
-		: name(_name)
-		, value(_value),
-		location(_location)
-	{ }
-};
-
-struct ParamType
-{
-	const ParamFlag flag;
-	std::string type;
-	std::vector<ParamItem> items;
-
-	ParamType(const ParamFlag _flag, const std::string& _type)
-		: flag(_flag)
-		, type(_type)
-	{
-	}
-
-	bool SearchName(const std::string& name)
-	{
-		for (u32 i = 0; i<items.size(); ++i)
-		{
-			if (items[i].name.compare(name) == 0) return true;
-		}
-
-		return false;
-	}
-};
-
-struct ParamArray
-{
-	std::vector<ParamType> params[PF_PARAM_COUNT];
-
-	ParamType* SearchParam(const ParamFlag &flag, const std::string& type)
-	{
-		for (u32 i = 0; i<params[flag].size(); ++i)
-		{
-			if (params[flag][i].type.compare(type) == 0)
-				return &params[flag][i];
-		}
-
-		return nullptr;
-	}
-
-	bool HasParam(const ParamFlag flag, std::string type, const std::string& name)
-	{
-		ParamType* t = SearchParam(flag, type);
-		return t && t->SearchName(name);
-	}
-
-	std::string AddParam(const ParamFlag flag, std::string type, const std::string& name, const std::string& value)
-	{
-		ParamType* t = SearchParam(flag, type);
-
-		if (t)
-		{
-			if (!t->SearchName(name)) t->items.emplace_back(name, -1, value);
-		}
-		else
-		{
-			params[flag].emplace_back(flag, type);
-			params[flag].back().items.emplace_back(name, -1, value);
-		}
-
-		return name;
-	}
-
-	std::string AddParam(const ParamFlag flag, std::string type, const std::string& name, int location = -1)
-	{
-		ParamType* t = SearchParam(flag, type);
-
-		if (t)
-		{
-			if (!t->SearchName(name)) t->items.emplace_back(name, location);
-		}
-		else
-		{
-			params[flag].emplace_back(flag, type);
-			params[flag].back().items.emplace_back(name, location);
-		}
-
-		return name;
-	}
-};
-
-class ShaderVariable
-{
-public:
-	std::string name;
-	std::vector<std::string> swizzles;
-
-	ShaderVariable() = default;
-	ShaderVariable(const std::string& var)
-	{
-		auto var_blocks = fmt::split(var, { "." });
-
-		if (var_blocks.size() == 0)
-		{
-			assert(0);
-		}
-
-		name = var_blocks[0];
-
-		if (var_blocks.size() == 1)
-		{
-			swizzles.push_back("xyzw");
-		}
-		else
-		{
-			swizzles = std::vector<std::string>(var_blocks.begin() + 1, var_blocks.end());
-		}
-	}
-
-	size_t get_vector_size() const
-	{
-		return swizzles[swizzles.size() - 1].length();
-	}
-
-	ShaderVariable& symplify()
-	{
-		std::unordered_map<char, char> swizzle;
-
-		static std::unordered_map<int, char> pos_to_swizzle =
-		{
-			{ 0, 'x' },
-			{ 1, 'y' },
-			{ 2, 'z' },
-			{ 3, 'w' }
-		};
-
-		for (auto &i : pos_to_swizzle)
-		{
-			swizzle[i.second] = swizzles[0].length() > i.first ? swizzles[0][i.first] : 0;
-		}
-
-		for (int i = 1; i < swizzles.size(); ++i)
-		{
-			std::unordered_map<char, char> new_swizzle;
-
-			for (auto &sw : pos_to_swizzle)
-			{
-				new_swizzle[sw.second] = swizzle[swizzles[i].length() <= sw.first ? '\0' : swizzles[i][sw.first]];
-			}
-
-			swizzle = new_swizzle;
-		}
-
-		swizzles.clear();
-		std::string new_swizzle;
-
-		for (auto &i : pos_to_swizzle)
-		{
-			if (swizzle[i.second] != '\0')
-				new_swizzle += swizzle[i.second];
-		}
-
-		swizzles.push_back(new_swizzle);
-
-		return *this;
-	}
-
-	std::string get() const
-	{
-		if (swizzles.size() == 1 && swizzles[0] == "xyzw")
-		{
-			return name;
-		}
-
-		return name + "." + fmt::merge({ swizzles }, ".");
-	}
-};
-#endif
\ No newline at end of file
diff --git a/rpcs3/emucore.vcxproj b/rpcs3/emucore.vcxproj
index 5ff058f7d5..88d174a108 100644
--- a/rpcs3/emucore.vcxproj
+++ b/rpcs3/emucore.vcxproj
@@ -42,12 +42,11 @@
     <ClCompile Include="Emu\RSX\Common\ShaderParam.cpp" />
     <ClCompile Include="Emu\RSX\Common\VertexProgramDecompiler.cpp" />
     <ClCompile Include="Emu\RSX\D3D12\D3D12Buffer.cpp" />
+    <ClCompile Include="Emu\RSX\D3D12\D3D12FragmentProgramDecompiler.cpp" />
     <ClCompile Include="Emu\RSX\D3D12\D3D12GSRender.cpp" />
     <ClCompile Include="Emu\RSX\D3D12\D3D12PipelineState.cpp" />
     <ClCompile Include="Emu\RSX\D3D12\D3D12RenderTargetSets.cpp" />
-    <ClCompile Include="Emu\RSX\D3D12\FragmentProgramDecompiler.cpp" />
-    <ClCompile Include="Emu\RSX\D3D12\ShaderParam.cpp" />
-    <ClCompile Include="Emu\RSX\D3D12\VertexProgramDecompiler.cpp" />
+    <ClCompile Include="Emu\RSX\D3D12\D3D12VertexProgramDecompiler.cpp" />
     <ClCompile Include="Emu\RSX\GL\GLCommonDecompiler.cpp" />
     <ClCompile Include="Emu\SysCalls\lv2\sys_dbg.cpp" />
     <ClCompile Include="Emu\SysCalls\lv2\sys_fs.cpp" />
@@ -506,12 +505,11 @@
     <ClInclude Include="Emu\RSX\Common\ShaderParam.h" />
     <ClInclude Include="Emu\RSX\Common\VertexProgramDecompiler.h" />
     <ClInclude Include="Emu\RSX\D3D12\D3D12Buffer.h" />
+    <ClInclude Include="Emu\RSX\D3D12\D3D12FragmentProgramDecompiler.h" />
     <ClInclude Include="Emu\RSX\D3D12\D3D12GSRender.h" />
     <ClInclude Include="Emu\RSX\D3D12\D3D12PipelineState.h" />
     <ClInclude Include="Emu\RSX\D3D12\D3D12RenderTargetSets.h" />
-    <ClInclude Include="Emu\RSX\D3D12\FragmentProgramDecompiler.h" />
-    <ClInclude Include="Emu\RSX\D3D12\ShaderParam.h" />
-    <ClInclude Include="Emu\RSX\D3D12\VertexProgramDecompiler.h" />
+    <ClInclude Include="Emu\RSX\D3D12\D3D12VertexProgramDecompiler.h" />
     <ClInclude Include="Emu\RSX\GCM.h" />
     <ClInclude Include="Emu\RSX\GL\GLBuffers.h" />
     <ClInclude Include="Emu\RSX\GL\GLCommonDecompiler.h" />
diff --git a/rpcs3/emucore.vcxproj.filters b/rpcs3/emucore.vcxproj.filters
index cc40c3f295..21b05ad7e5 100644
--- a/rpcs3/emucore.vcxproj.filters
+++ b/rpcs3/emucore.vcxproj.filters
@@ -980,13 +980,10 @@
     <ClCompile Include="Emu\RSX\D3D12\D3D12RenderTargetSets.cpp">
       <Filter>Emu\GPU\RSX\D3D12</Filter>
     </ClCompile>
-    <ClCompile Include="Emu\RSX\D3D12\FragmentProgramDecompiler.cpp">
+    <ClCompile Include="Emu\RSX\D3D12\D3D12FragmentProgramDecompiler.cpp">
       <Filter>Emu\GPU\RSX\D3D12</Filter>
     </ClCompile>
-    <ClCompile Include="Emu\RSX\D3D12\ShaderParam.cpp">
-      <Filter>Emu\GPU\RSX\D3D12</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\D3D12\VertexProgramDecompiler.cpp">
+    <ClCompile Include="Emu\RSX\D3D12\D3D12VertexProgramDecompiler.cpp">
       <Filter>Emu\GPU\RSX\D3D12</Filter>
     </ClCompile>
   </ItemGroup>
@@ -1864,13 +1861,10 @@
     <ClInclude Include="Emu\RSX\D3D12\D3D12PipelineState.h">
       <Filter>Emu\GPU\RSX\D3D12</Filter>
     </ClInclude>
-    <ClInclude Include="Emu\RSX\D3D12\FragmentProgramDecompiler.h">
+    <ClInclude Include="Emu\RSX\D3D12\D3D12FragmentProgramDecompiler.h">
       <Filter>Emu\GPU\RSX\D3D12</Filter>
     </ClInclude>
-    <ClInclude Include="Emu\RSX\D3D12\ShaderParam.h">
-      <Filter>Emu\GPU\RSX\D3D12</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\D3D12\VertexProgramDecompiler.h">
+    <ClInclude Include="Emu\RSX\D3D12\D3D12VertexProgramDecompiler.h">
       <Filter>Emu\GPU\RSX\D3D12</Filter>
     </ClInclude>
   </ItemGroup>