diff --git a/rpcs3/Emu/RSX/VK/upscalers/fsr1/fsr_ffx_a_flattened.inc b/rpcs3/Emu/RSX/Program/Upscalers/FSR1/fsr_ffx_a_flattened.inc
similarity index 100%
rename from rpcs3/Emu/RSX/VK/upscalers/fsr1/fsr_ffx_a_flattened.inc
rename to rpcs3/Emu/RSX/Program/Upscalers/FSR1/fsr_ffx_a_flattened.inc
diff --git a/rpcs3/Emu/RSX/VK/upscalers/fsr1/fsr_ffx_fsr1_flattened.inc b/rpcs3/Emu/RSX/Program/Upscalers/FSR1/fsr_ffx_fsr1_flattened.inc
similarity index 100%
rename from rpcs3/Emu/RSX/VK/upscalers/fsr1/fsr_ffx_fsr1_flattened.inc
rename to rpcs3/Emu/RSX/Program/Upscalers/FSR1/fsr_ffx_fsr1_flattened.inc
diff --git a/rpcs3/Emu/RSX/VK/upscalers/fsr1/fsr_ubershader.glsl b/rpcs3/Emu/RSX/Program/Upscalers/FSR1/fsr_ubershader.glsl
similarity index 100%
rename from rpcs3/Emu/RSX/VK/upscalers/fsr1/fsr_ubershader.glsl
rename to rpcs3/Emu/RSX/Program/Upscalers/FSR1/fsr_ubershader.glsl
diff --git a/rpcs3/Emu/RSX/VK/upscalers/fsr1/fsr_pass.cpp b/rpcs3/Emu/RSX/VK/upscalers/fsr1/fsr_pass.cpp
index 1dcee7d934..0878640f5a 100644
--- a/rpcs3/Emu/RSX/VK/upscalers/fsr1/fsr_pass.cpp
+++ b/rpcs3/Emu/RSX/VK/upscalers/fsr1/fsr_pass.cpp
@@ -35,16 +35,16 @@ namespace vk
 		{
 			// Just use AMD-provided source with minimal modification
 			const char* shader_core =
-				#include "fsr_ubershader.glsl"
+				#include "Emu/RSX/Program/Upscalers/FSR1/fsr_ubershader.glsl"
 			;
 
 			// Replacements
 			const char* ffx_a_contents =
-				#include "fsr_ffx_a_flattened.inc"
+				#include "Emu/RSX/Program/Upscalers/FSR1/fsr_ffx_a_flattened.inc"
 			;
 
 			const char* ffx_fsr_contents =
-				#include "fsr_ffx_fsr1_flattened.inc"
+				#include "Emu/RSX/Program/Upscalers/FSR1/fsr_ffx_fsr1_flattened.inc"
 			;
 
 			m_src = shader_core;
diff --git a/rpcs3/GLGSRender.vcxproj b/rpcs3/GLGSRender.vcxproj
index 64f197a65b..2b7a4b02c6 100644
--- a/rpcs3/GLGSRender.vcxproj
+++ b/rpcs3/GLGSRender.vcxproj
@@ -1,113 +1,118 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <RootNamespace>GLGSRender</RootNamespace>
-    <ProjectGuid>{3384223A-6D97-4799-9862-359F85312892}</ProjectGuid>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\buildfiles\msvc\common_default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup>
-    <PreferredToolArchitecture>x64</PreferredToolArchitecture>
-  </PropertyGroup>
-  <Import Project="$(SolutionDir)\buildfiles\msvc\common_default_macros.props" />
-  <PropertyGroup Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(SolutionDir)\buildfiles\msvc\rpcs3_default.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(SolutionDir)\buildfiles\msvc\rpcs3_debug.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(SolutionDir)\buildfiles\msvc\rpcs3_release.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ProjectReference Include="emucore.vcxproj">
-      <Project>{c4a10229-4712-4bd2-b63e-50d93c67a038}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Emu\RSX\GL\GLCompute.h" />
-    <ClInclude Include="Emu\RSX\GL\GLOverlays.h" />
-    <ClInclude Include="Emu\RSX\GL\GLPipelineCompiler.h" />
-    <ClInclude Include="Emu\RSX\GL\GLCommonDecompiler.h" />
-    <ClInclude Include="Emu\RSX\GL\GLFragmentProgram.h" />
-    <ClInclude Include="Emu\RSX\GL\GLGSRender.h" />
-    <ClInclude Include="Emu\RSX\GL\GLProcTable.h" />
-    <ClInclude Include="Emu\RSX\GL\GLProgramBuffer.h" />
-    <ClInclude Include="Emu\RSX\GL\glutils\blitter.h" />
-    <ClInclude Include="Emu\RSX\GL\glutils\buffer_object.h" />
-    <ClInclude Include="Emu\RSX\GL\glutils\capabilities.h" />
-    <ClInclude Include="Emu\RSX\GL\glutils\common.h" />
-    <ClInclude Include="Emu\RSX\GL\glutils\fbo.h" />
-    <ClInclude Include="Emu\RSX\GL\glutils\pixel_settings.hpp" />
-    <ClInclude Include="Emu\RSX\GL\glutils\program.h" />
-    <ClInclude Include="Emu\RSX\GL\glutils\ring_buffer.h" />
-    <ClInclude Include="Emu\RSX\GL\glutils\sampler.h" />
-    <ClInclude Include="Emu\RSX\GL\glutils\state_tracker.hpp" />
-    <ClInclude Include="Emu\RSX\GL\glutils\image.h" />
-    <ClInclude Include="Emu\RSX\GL\glutils\sync.hpp" />
-    <ClInclude Include="Emu\RSX\GL\glutils\vao.hpp" />
-    <ClInclude Include="Emu\RSX\GL\GLVertexProgram.h" />
-    <ClInclude Include="Emu\RSX\GL\GLHelpers.h" />
-    <ClInclude Include="Emu\RSX\GL\GLRenderTargets.h" />
-    <ClInclude Include="Emu\RSX\GL\GLShaderInterpreter.h" />
-    <ClInclude Include="Emu\RSX\GL\GLTextureCache.h" />
-    <ClInclude Include="Emu\RSX\GL\OpenGL.h" />
-    <ClInclude Include="Emu\RSX\GL\GLTexture.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="Emu\RSX\GL\GLCommonDecompiler.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLCompute.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLDraw.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLFragmentProgram.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLGSRender.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLOverlays.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLPipelineCompiler.cpp" />
-    <ClCompile Include="Emu\RSX\GL\glutils\blitter.cpp" />
-    <ClCompile Include="Emu\RSX\GL\glutils\buffer_object.cpp" />
-    <ClCompile Include="Emu\RSX\GL\glutils\capabilities.cpp" />
-    <ClCompile Include="Emu\RSX\GL\glutils\common.cpp" />
-    <ClCompile Include="Emu\RSX\GL\glutils\fbo.cpp" />
-    <ClCompile Include="Emu\RSX\GL\glutils\program.cpp" />
-    <ClCompile Include="Emu\RSX\GL\glutils\ring_buffer.cpp" />
-    <ClCompile Include="Emu\RSX\GL\glutils\image.cpp" />
-    <ClCompile Include="Emu\RSX\GL\glutils\sampler.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLVertexProgram.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLHelpers.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLPresent.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLRenderTargets.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLShaderInterpreter.cpp" />
-    <ClCompile Include="Emu\RSX\GL\OpenGL.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLTexture.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLVertexBuffers.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLTextureCache.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <RootNamespace>GLGSRender</RootNamespace>
+    <ProjectGuid>{3384223A-6D97-4799-9862-359F85312892}</ProjectGuid>
+  </PropertyGroup>
+  <Import Project="$(SolutionDir)\buildfiles\msvc\common_default.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup>
+    <PreferredToolArchitecture>x64</PreferredToolArchitecture>
+  </PropertyGroup>
+  <Import Project="$(SolutionDir)\buildfiles\msvc\common_default_macros.props" />
+  <PropertyGroup Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(SolutionDir)\buildfiles\msvc\rpcs3_default.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(SolutionDir)\buildfiles\msvc\rpcs3_debug.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(SolutionDir)\buildfiles\msvc\rpcs3_release.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <Optimization>MaxSpeed</Optimization>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ProjectReference Include="emucore.vcxproj">
+      <Project>{c4a10229-4712-4bd2-b63e-50d93c67a038}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Emu\RSX\GL\GLCompute.h" />
+    <ClInclude Include="Emu\RSX\GL\GLOverlays.h" />
+    <ClInclude Include="Emu\RSX\GL\GLPipelineCompiler.h" />
+    <ClInclude Include="Emu\RSX\GL\GLCommonDecompiler.h" />
+    <ClInclude Include="Emu\RSX\GL\GLFragmentProgram.h" />
+    <ClInclude Include="Emu\RSX\GL\GLGSRender.h" />
+    <ClInclude Include="Emu\RSX\GL\GLProcTable.h" />
+    <ClInclude Include="Emu\RSX\GL\GLProgramBuffer.h" />
+    <ClInclude Include="Emu\RSX\GL\glutils\blitter.h" />
+    <ClInclude Include="Emu\RSX\GL\glutils\buffer_object.h" />
+    <ClInclude Include="Emu\RSX\GL\glutils\capabilities.h" />
+    <ClInclude Include="Emu\RSX\GL\glutils\common.h" />
+    <ClInclude Include="Emu\RSX\GL\glutils\fbo.h" />
+    <ClInclude Include="Emu\RSX\GL\glutils\pixel_settings.hpp" />
+    <ClInclude Include="Emu\RSX\GL\glutils\program.h" />
+    <ClInclude Include="Emu\RSX\GL\glutils\ring_buffer.h" />
+    <ClInclude Include="Emu\RSX\GL\glutils\sampler.h" />
+    <ClInclude Include="Emu\RSX\GL\glutils\state_tracker.hpp" />
+    <ClInclude Include="Emu\RSX\GL\glutils\image.h" />
+    <ClInclude Include="Emu\RSX\GL\glutils\sync.hpp" />
+    <ClInclude Include="Emu\RSX\GL\glutils\vao.hpp" />
+    <ClInclude Include="Emu\RSX\GL\GLVertexProgram.h" />
+    <ClInclude Include="Emu\RSX\GL\GLHelpers.h" />
+    <ClInclude Include="Emu\RSX\GL\GLRenderTargets.h" />
+    <ClInclude Include="Emu\RSX\GL\GLShaderInterpreter.h" />
+    <ClInclude Include="Emu\RSX\GL\GLTextureCache.h" />
+    <ClInclude Include="Emu\RSX\GL\OpenGL.h" />
+    <ClInclude Include="Emu\RSX\GL\GLTexture.h" />
+    <ClInclude Include="Emu\RSX\GL\upscalers\bilinear_pass.hpp" />
+    <ClInclude Include="Emu\RSX\GL\upscalers\nearest_pass.hpp" />
+    <ClInclude Include="Emu\RSX\GL\upscalers\static_pass.hpp" />
+    <ClInclude Include="Emu\RSX\GL\upscalers\upscaling.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="Emu\RSX\GL\GLCommonDecompiler.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLCompute.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLDraw.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLFragmentProgram.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLGSRender.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLOverlays.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLPipelineCompiler.cpp" />
+    <ClCompile Include="Emu\RSX\GL\glutils\blitter.cpp" />
+    <ClCompile Include="Emu\RSX\GL\glutils\buffer_object.cpp" />
+    <ClCompile Include="Emu\RSX\GL\glutils\capabilities.cpp" />
+    <ClCompile Include="Emu\RSX\GL\glutils\common.cpp" />
+    <ClCompile Include="Emu\RSX\GL\glutils\fbo.cpp" />
+    <ClCompile Include="Emu\RSX\GL\glutils\program.cpp" />
+    <ClCompile Include="Emu\RSX\GL\glutils\ring_buffer.cpp" />
+    <ClCompile Include="Emu\RSX\GL\glutils\image.cpp" />
+    <ClCompile Include="Emu\RSX\GL\glutils\sampler.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLVertexProgram.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLHelpers.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLPresent.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLRenderTargets.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLShaderInterpreter.cpp" />
+    <ClCompile Include="Emu\RSX\GL\OpenGL.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLTexture.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLVertexBuffers.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLTextureCache.cpp" />
+    <ClCompile Include="Emu\RSX\GL\upscalers\fsr1\fsr_pass.cpp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/rpcs3/GLGSRender.vcxproj.filters b/rpcs3/GLGSRender.vcxproj.filters
index 52fb34ef4a..d8bc8f13ce 100644
--- a/rpcs3/GLGSRender.vcxproj.filters
+++ b/rpcs3/GLGSRender.vcxproj.filters
@@ -1,109 +1,130 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <ClCompile Include="Emu\RSX\GL\GLDraw.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLTexture.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLHelpers.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLCommonDecompiler.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLFragmentProgram.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLGSRender.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLVertexProgram.cpp" />
-    <ClCompile Include="Emu\RSX\GL\OpenGL.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLPresent.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLRenderTargets.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLShaderInterpreter.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLVertexBuffers.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLPipelineCompiler.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLTextureCache.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLOverlays.cpp" />
-    <ClCompile Include="Emu\RSX\GL\GLCompute.cpp" />
-    <ClCompile Include="Emu\RSX\GL\glutils\buffer_object.cpp">
-      <Filter>glutils</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\GL\glutils\ring_buffer.cpp">
-      <Filter>glutils</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\GL\glutils\image.cpp">
-      <Filter>glutils</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\GL\glutils\common.cpp">
-      <Filter>glutils</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\GL\glutils\blitter.cpp">
-      <Filter>glutils</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\GL\glutils\fbo.cpp">
-      <Filter>glutils</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\GL\glutils\program.cpp">
-      <Filter>glutils</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\GL\glutils\sampler.cpp">
-      <Filter>glutils</Filter>
-    </ClCompile>
-    <ClCompile Include="Emu\RSX\GL\glutils\capabilities.cpp">
-      <Filter>glutils</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="Emu\RSX\GL\GLTexture.h" />
-    <ClInclude Include="Emu\RSX\GL\GLHelpers.h" />
-    <ClInclude Include="Emu\RSX\GL\GLCommonDecompiler.h" />
-    <ClInclude Include="Emu\RSX\GL\GLFragmentProgram.h" />
-    <ClInclude Include="Emu\RSX\GL\GLGSRender.h" />
-    <ClInclude Include="Emu\RSX\GL\GLProcTable.h" />
-    <ClInclude Include="Emu\RSX\GL\GLProgramBuffer.h" />
-    <ClInclude Include="Emu\RSX\GL\GLVertexProgram.h" />
-    <ClInclude Include="Emu\RSX\GL\OpenGL.h" />
-    <ClInclude Include="Emu\RSX\GL\GLTextureCache.h" />
-    <ClInclude Include="Emu\RSX\GL\GLRenderTargets.h" />
-    <ClInclude Include="Emu\RSX\GL\GLShaderInterpreter.h" />
-    <ClInclude Include="Emu\RSX\GL\GLOverlays.h" />
-    <ClInclude Include="Emu\RSX\GL\GLCompute.h" />
-    <ClInclude Include="Emu\RSX\GL\GLPipelineCompiler.h" />
-    <ClInclude Include="Emu\RSX\GL\glutils\buffer_object.h">
-      <Filter>glutils</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\GL\glutils\ring_buffer.h">
-      <Filter>glutils</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\GL\glutils\common.h">
-      <Filter>glutils</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\GL\glutils\capabilities.h">
-      <Filter>glutils</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\GL\glutils\image.h">
-      <Filter>glutils</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\GL\glutils\state_tracker.hpp">
-      <Filter>glutils</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\GL\glutils\pixel_settings.hpp">
-      <Filter>glutils</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\GL\glutils\blitter.h">
-      <Filter>glutils</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\GL\glutils\fbo.h">
-      <Filter>glutils</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\GL\glutils\vao.hpp">
-      <Filter>glutils</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\GL\glutils\program.h">
-      <Filter>glutils</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\GL\glutils\sync.hpp">
-      <Filter>glutils</Filter>
-    </ClInclude>
-    <ClInclude Include="Emu\RSX\GL\glutils\sampler.h">
-      <Filter>glutils</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Filter Include="glutils">
-      <UniqueIdentifier>{ed9ef6b7-efbb-4a8e-88a4-583b6655c141}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="Emu\RSX\GL\GLDraw.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLTexture.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLHelpers.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLCommonDecompiler.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLFragmentProgram.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLGSRender.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLVertexProgram.cpp" />
+    <ClCompile Include="Emu\RSX\GL\OpenGL.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLPresent.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLRenderTargets.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLShaderInterpreter.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLVertexBuffers.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLPipelineCompiler.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLTextureCache.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLOverlays.cpp" />
+    <ClCompile Include="Emu\RSX\GL\GLCompute.cpp" />
+    <ClCompile Include="Emu\RSX\GL\glutils\buffer_object.cpp">
+      <Filter>glutils</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\RSX\GL\glutils\ring_buffer.cpp">
+      <Filter>glutils</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\RSX\GL\glutils\image.cpp">
+      <Filter>glutils</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\RSX\GL\glutils\common.cpp">
+      <Filter>glutils</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\RSX\GL\glutils\blitter.cpp">
+      <Filter>glutils</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\RSX\GL\glutils\fbo.cpp">
+      <Filter>glutils</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\RSX\GL\glutils\program.cpp">
+      <Filter>glutils</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\RSX\GL\glutils\sampler.cpp">
+      <Filter>glutils</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\RSX\GL\glutils\capabilities.cpp">
+      <Filter>glutils</Filter>
+    </ClCompile>
+    <ClCompile Include="Emu\RSX\GL\upscalers\fsr1\fsr_pass.cpp">
+      <Filter>upscalers\fsr1</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Emu\RSX\GL\GLTexture.h" />
+    <ClInclude Include="Emu\RSX\GL\GLHelpers.h" />
+    <ClInclude Include="Emu\RSX\GL\GLCommonDecompiler.h" />
+    <ClInclude Include="Emu\RSX\GL\GLFragmentProgram.h" />
+    <ClInclude Include="Emu\RSX\GL\GLGSRender.h" />
+    <ClInclude Include="Emu\RSX\GL\GLProcTable.h" />
+    <ClInclude Include="Emu\RSX\GL\GLProgramBuffer.h" />
+    <ClInclude Include="Emu\RSX\GL\GLVertexProgram.h" />
+    <ClInclude Include="Emu\RSX\GL\OpenGL.h" />
+    <ClInclude Include="Emu\RSX\GL\GLTextureCache.h" />
+    <ClInclude Include="Emu\RSX\GL\GLRenderTargets.h" />
+    <ClInclude Include="Emu\RSX\GL\GLShaderInterpreter.h" />
+    <ClInclude Include="Emu\RSX\GL\GLOverlays.h" />
+    <ClInclude Include="Emu\RSX\GL\GLCompute.h" />
+    <ClInclude Include="Emu\RSX\GL\GLPipelineCompiler.h" />
+    <ClInclude Include="Emu\RSX\GL\glutils\buffer_object.h">
+      <Filter>glutils</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\RSX\GL\glutils\ring_buffer.h">
+      <Filter>glutils</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\RSX\GL\glutils\common.h">
+      <Filter>glutils</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\RSX\GL\glutils\capabilities.h">
+      <Filter>glutils</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\RSX\GL\glutils\image.h">
+      <Filter>glutils</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\RSX\GL\glutils\state_tracker.hpp">
+      <Filter>glutils</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\RSX\GL\glutils\pixel_settings.hpp">
+      <Filter>glutils</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\RSX\GL\glutils\blitter.h">
+      <Filter>glutils</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\RSX\GL\glutils\fbo.h">
+      <Filter>glutils</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\RSX\GL\glutils\vao.hpp">
+      <Filter>glutils</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\RSX\GL\glutils\program.h">
+      <Filter>glutils</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\RSX\GL\glutils\sync.hpp">
+      <Filter>glutils</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\RSX\GL\glutils\sampler.h">
+      <Filter>glutils</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\RSX\GL\upscalers\upscaling.h">
+      <Filter>upscalers</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\RSX\GL\upscalers\bilinear_pass.hpp">
+      <Filter>upscalers</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\RSX\GL\upscalers\static_pass.hpp">
+      <Filter>upscalers</Filter>
+    </ClInclude>
+    <ClInclude Include="Emu\RSX\GL\upscalers\nearest_pass.hpp">
+      <Filter>upscalers</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="glutils">
+      <UniqueIdentifier>{ed9ef6b7-efbb-4a8e-88a4-583b6655c141}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="upscalers">
+      <UniqueIdentifier>{4ce10cbf-4595-433a-a21a-035bf40bb4e5}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="upscalers\fsr1">
+      <UniqueIdentifier>{d5626eff-1471-4810-9e57-0f8987f86d67}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/rpcs3/VKGSRender.vcxproj b/rpcs3/VKGSRender.vcxproj
index 0ed839bb1b..b8ef40622d 100644
--- a/rpcs3/VKGSRender.vcxproj
+++ b/rpcs3/VKGSRender.vcxproj
@@ -109,11 +109,6 @@
       <Project>{c4a10229-4712-4bd2-b63e-50d93c67a038}</Project>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="Emu\RSX\VK\upscalers\fsr1\fsr_ffx_a_flattened.inc" />
-    <None Include="Emu\RSX\VK\upscalers\fsr1\fsr_ffx_fsr1_flattened.inc" />
-    <None Include="Emu\RSX\VK\upscalers\fsr1\fsr_ubershader.glsl" />
-  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{3EE5F075-B546-42C4-B6A8-E3CCEF38B78D}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
diff --git a/rpcs3/VKGSRender.vcxproj.filters b/rpcs3/VKGSRender.vcxproj.filters
index ea01969b46..bc2791f16a 100644
--- a/rpcs3/VKGSRender.vcxproj.filters
+++ b/rpcs3/VKGSRender.vcxproj.filters
@@ -185,15 +185,4 @@
       <UniqueIdentifier>{8387b0fc-178f-4c9c-9cf2-03df99ce4df2}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="Emu\RSX\VK\upscalers\fsr1\fsr_ffx_a_flattened.inc">
-      <Filter>upscalers\fsr1</Filter>
-    </None>
-    <None Include="Emu\RSX\VK\upscalers\fsr1\fsr_ffx_fsr1_flattened.inc">
-      <Filter>upscalers\fsr1</Filter>
-    </None>
-    <None Include="Emu\RSX\VK\upscalers\fsr1\fsr_ubershader.glsl">
-      <Filter>upscalers\fsr1</Filter>
-    </None>
-  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/rpcs3/emucore.vcxproj b/rpcs3/emucore.vcxproj
index 9c80f18646..c9eb9904a2 100644
--- a/rpcs3/emucore.vcxproj
+++ b/rpcs3/emucore.vcxproj
@@ -944,6 +944,9 @@
     <None Include="Emu\RSX\Program\GLSLSnippets\RSXProg\RSXVertexPrologue.glsl" />
     <None Include="Emu\RSX\Program\GLSLSnippets\ShuffleBytes.glsl" />
     <None Include="Emu\RSX\Program\GLSLSnippets\VideoOutCalibrationPass.glsl" />
+    <None Include="Emu\RSX\Program\Upscalers\FSR1\fsr_ffx_a_flattened.inc" />
+    <None Include="Emu\RSX\Program\Upscalers\FSR1\fsr_ffx_fsr1_flattened.inc" />
+    <None Include="Emu\RSX\Program\Upscalers\FSR1\fsr_ubershader.glsl" />
   </ItemGroup>
   <PropertyGroup Label="UserMacros" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/rpcs3/emucore.vcxproj.filters b/rpcs3/emucore.vcxproj.filters
index 602fb4f143..224fc986cb 100644
--- a/rpcs3/emucore.vcxproj.filters
+++ b/rpcs3/emucore.vcxproj.filters
@@ -91,6 +91,12 @@
     <Filter Include="Emu\GPU\RSX\Overlays\Network">
       <UniqueIdentifier>{d7a60dc0-ac4e-4983-97d3-ce1328af49a7}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Emu\GPU\RSX\Program\Upscalers">
+      <UniqueIdentifier>{646a5689-94cc-43f3-82fb-213e21c7a31f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Emu\GPU\RSX\Program\Upscalers\FSR1">
+      <UniqueIdentifier>{cab197c1-581c-49db-9d8b-670335b44cb2}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Crypto\aes.cpp">
@@ -2514,5 +2520,14 @@
     <None Include="Emu\RSX\Program\GLSLSnippets\VideoOutCalibrationPass.glsl">
       <Filter>Emu\GPU\RSX\Program\Snippets</Filter>
     </None>
+    <None Include="Emu\RSX\Program\Upscalers\FSR1\fsr_ffx_a_flattened.inc">
+      <Filter>Emu\GPU\RSX\Program\Upscalers\FSR1</Filter>
+    </None>
+    <None Include="Emu\RSX\Program\Upscalers\FSR1\fsr_ffx_fsr1_flattened.inc">
+      <Filter>Emu\GPU\RSX\Program\Upscalers\FSR1</Filter>
+    </None>
+    <None Include="Emu\RSX\Program\Upscalers\FSR1\fsr_ubershader.glsl">
+      <Filter>Emu\GPU\RSX\Program\Upscalers\FSR1</Filter>
+    </None>
   </ItemGroup>
 </Project>
\ No newline at end of file