rsx/vk: Refactor FSR integration to support multiple backends

This commit is contained in:
kd-11 2024-02-22 03:52:53 +03:00 committed by kd-11
parent 0f682b7da1
commit e7d8ef924f
10 changed files with 267 additions and 239 deletions

View file

@ -35,16 +35,16 @@ namespace vk
{ {
// Just use AMD-provided source with minimal modification // Just use AMD-provided source with minimal modification
const char* shader_core = const char* shader_core =
#include "fsr_ubershader.glsl" #include "Emu/RSX/Program/Upscalers/FSR1/fsr_ubershader.glsl"
; ;
// Replacements // Replacements
const char* ffx_a_contents = 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 = 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; m_src = shader_core;

View file

@ -1,113 +1,118 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations"> <ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|x64"> <ProjectConfiguration Include="Debug|x64">
<Configuration>Debug</Configuration> <Configuration>Debug</Configuration>
<Platform>x64</Platform> <Platform>x64</Platform>
</ProjectConfiguration> </ProjectConfiguration>
<ProjectConfiguration Include="Release|x64"> <ProjectConfiguration Include="Release|x64">
<Configuration>Release</Configuration> <Configuration>Release</Configuration>
<Platform>x64</Platform> <Platform>x64</Platform>
</ProjectConfiguration> </ProjectConfiguration>
</ItemGroup> </ItemGroup>
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<RootNamespace>GLGSRender</RootNamespace> <RootNamespace>GLGSRender</RootNamespace>
<ProjectGuid>{3384223A-6D97-4799-9862-359F85312892}</ProjectGuid> <ProjectGuid>{3384223A-6D97-4799-9862-359F85312892}</ProjectGuid>
</PropertyGroup> </PropertyGroup>
<Import Project="$(SolutionDir)\buildfiles\msvc\common_default.props" /> <Import Project="$(SolutionDir)\buildfiles\msvc\common_default.props" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup> <PropertyGroup>
<PreferredToolArchitecture>x64</PreferredToolArchitecture> <PreferredToolArchitecture>x64</PreferredToolArchitecture>
</PropertyGroup> </PropertyGroup>
<Import Project="$(SolutionDir)\buildfiles\msvc\common_default_macros.props" /> <Import Project="$(SolutionDir)\buildfiles\msvc\common_default_macros.props" />
<PropertyGroup Label="Configuration"> <PropertyGroup Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType> <ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet> <CharacterSet>Unicode</CharacterSet>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings"> <ImportGroup Label="ExtensionSettings">
</ImportGroup> </ImportGroup>
<ImportGroup Label="Shared"> <ImportGroup Label="Shared">
</ImportGroup> </ImportGroup>
<ImportGroup Label="PropertySheets"> <ImportGroup Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> <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" /> <Import Project="$(SolutionDir)\buildfiles\msvc\rpcs3_default.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Import Project="$(SolutionDir)\buildfiles\msvc\rpcs3_debug.props" /> <Import Project="$(SolutionDir)\buildfiles\msvc\rpcs3_debug.props" />
</ImportGroup> </ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<Import Project="$(SolutionDir)\buildfiles\msvc\rpcs3_release.props" /> <Import Project="$(SolutionDir)\buildfiles\msvc\rpcs3_release.props" />
</ImportGroup> </ImportGroup>
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile> <ClCompile>
<Optimization>MaxSpeed</Optimization> <Optimization>MaxSpeed</Optimization>
</ClCompile> </ClCompile>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="emucore.vcxproj"> <ProjectReference Include="emucore.vcxproj">
<Project>{c4a10229-4712-4bd2-b63e-50d93c67a038}</Project> <Project>{c4a10229-4712-4bd2-b63e-50d93c67a038}</Project>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="Emu\RSX\GL\GLCompute.h" /> <ClInclude Include="Emu\RSX\GL\GLCompute.h" />
<ClInclude Include="Emu\RSX\GL\GLOverlays.h" /> <ClInclude Include="Emu\RSX\GL\GLOverlays.h" />
<ClInclude Include="Emu\RSX\GL\GLPipelineCompiler.h" /> <ClInclude Include="Emu\RSX\GL\GLPipelineCompiler.h" />
<ClInclude Include="Emu\RSX\GL\GLCommonDecompiler.h" /> <ClInclude Include="Emu\RSX\GL\GLCommonDecompiler.h" />
<ClInclude Include="Emu\RSX\GL\GLFragmentProgram.h" /> <ClInclude Include="Emu\RSX\GL\GLFragmentProgram.h" />
<ClInclude Include="Emu\RSX\GL\GLGSRender.h" /> <ClInclude Include="Emu\RSX\GL\GLGSRender.h" />
<ClInclude Include="Emu\RSX\GL\GLProcTable.h" /> <ClInclude Include="Emu\RSX\GL\GLProcTable.h" />
<ClInclude Include="Emu\RSX\GL\GLProgramBuffer.h" /> <ClInclude Include="Emu\RSX\GL\GLProgramBuffer.h" />
<ClInclude Include="Emu\RSX\GL\glutils\blitter.h" /> <ClInclude Include="Emu\RSX\GL\glutils\blitter.h" />
<ClInclude Include="Emu\RSX\GL\glutils\buffer_object.h" /> <ClInclude Include="Emu\RSX\GL\glutils\buffer_object.h" />
<ClInclude Include="Emu\RSX\GL\glutils\capabilities.h" /> <ClInclude Include="Emu\RSX\GL\glutils\capabilities.h" />
<ClInclude Include="Emu\RSX\GL\glutils\common.h" /> <ClInclude Include="Emu\RSX\GL\glutils\common.h" />
<ClInclude Include="Emu\RSX\GL\glutils\fbo.h" /> <ClInclude Include="Emu\RSX\GL\glutils\fbo.h" />
<ClInclude Include="Emu\RSX\GL\glutils\pixel_settings.hpp" /> <ClInclude Include="Emu\RSX\GL\glutils\pixel_settings.hpp" />
<ClInclude Include="Emu\RSX\GL\glutils\program.h" /> <ClInclude Include="Emu\RSX\GL\glutils\program.h" />
<ClInclude Include="Emu\RSX\GL\glutils\ring_buffer.h" /> <ClInclude Include="Emu\RSX\GL\glutils\ring_buffer.h" />
<ClInclude Include="Emu\RSX\GL\glutils\sampler.h" /> <ClInclude Include="Emu\RSX\GL\glutils\sampler.h" />
<ClInclude Include="Emu\RSX\GL\glutils\state_tracker.hpp" /> <ClInclude Include="Emu\RSX\GL\glutils\state_tracker.hpp" />
<ClInclude Include="Emu\RSX\GL\glutils\image.h" /> <ClInclude Include="Emu\RSX\GL\glutils\image.h" />
<ClInclude Include="Emu\RSX\GL\glutils\sync.hpp" /> <ClInclude Include="Emu\RSX\GL\glutils\sync.hpp" />
<ClInclude Include="Emu\RSX\GL\glutils\vao.hpp" /> <ClInclude Include="Emu\RSX\GL\glutils\vao.hpp" />
<ClInclude Include="Emu\RSX\GL\GLVertexProgram.h" /> <ClInclude Include="Emu\RSX\GL\GLVertexProgram.h" />
<ClInclude Include="Emu\RSX\GL\GLHelpers.h" /> <ClInclude Include="Emu\RSX\GL\GLHelpers.h" />
<ClInclude Include="Emu\RSX\GL\GLRenderTargets.h" /> <ClInclude Include="Emu\RSX\GL\GLRenderTargets.h" />
<ClInclude Include="Emu\RSX\GL\GLShaderInterpreter.h" /> <ClInclude Include="Emu\RSX\GL\GLShaderInterpreter.h" />
<ClInclude Include="Emu\RSX\GL\GLTextureCache.h" /> <ClInclude Include="Emu\RSX\GL\GLTextureCache.h" />
<ClInclude Include="Emu\RSX\GL\OpenGL.h" /> <ClInclude Include="Emu\RSX\GL\OpenGL.h" />
<ClInclude Include="Emu\RSX\GL\GLTexture.h" /> <ClInclude Include="Emu\RSX\GL\GLTexture.h" />
</ItemGroup> <ClInclude Include="Emu\RSX\GL\upscalers\bilinear_pass.hpp" />
<ItemGroup> <ClInclude Include="Emu\RSX\GL\upscalers\nearest_pass.hpp" />
<ClCompile Include="Emu\RSX\GL\GLCommonDecompiler.cpp" /> <ClInclude Include="Emu\RSX\GL\upscalers\static_pass.hpp" />
<ClCompile Include="Emu\RSX\GL\GLCompute.cpp" /> <ClInclude Include="Emu\RSX\GL\upscalers\upscaling.h" />
<ClCompile Include="Emu\RSX\GL\GLDraw.cpp" /> </ItemGroup>
<ClCompile Include="Emu\RSX\GL\GLFragmentProgram.cpp" /> <ItemGroup>
<ClCompile Include="Emu\RSX\GL\GLGSRender.cpp" /> <ClCompile Include="Emu\RSX\GL\GLCommonDecompiler.cpp" />
<ClCompile Include="Emu\RSX\GL\GLOverlays.cpp" /> <ClCompile Include="Emu\RSX\GL\GLCompute.cpp" />
<ClCompile Include="Emu\RSX\GL\GLPipelineCompiler.cpp" /> <ClCompile Include="Emu\RSX\GL\GLDraw.cpp" />
<ClCompile Include="Emu\RSX\GL\glutils\blitter.cpp" /> <ClCompile Include="Emu\RSX\GL\GLFragmentProgram.cpp" />
<ClCompile Include="Emu\RSX\GL\glutils\buffer_object.cpp" /> <ClCompile Include="Emu\RSX\GL\GLGSRender.cpp" />
<ClCompile Include="Emu\RSX\GL\glutils\capabilities.cpp" /> <ClCompile Include="Emu\RSX\GL\GLOverlays.cpp" />
<ClCompile Include="Emu\RSX\GL\glutils\common.cpp" /> <ClCompile Include="Emu\RSX\GL\GLPipelineCompiler.cpp" />
<ClCompile Include="Emu\RSX\GL\glutils\fbo.cpp" /> <ClCompile Include="Emu\RSX\GL\glutils\blitter.cpp" />
<ClCompile Include="Emu\RSX\GL\glutils\program.cpp" /> <ClCompile Include="Emu\RSX\GL\glutils\buffer_object.cpp" />
<ClCompile Include="Emu\RSX\GL\glutils\ring_buffer.cpp" /> <ClCompile Include="Emu\RSX\GL\glutils\capabilities.cpp" />
<ClCompile Include="Emu\RSX\GL\glutils\image.cpp" /> <ClCompile Include="Emu\RSX\GL\glutils\common.cpp" />
<ClCompile Include="Emu\RSX\GL\glutils\sampler.cpp" /> <ClCompile Include="Emu\RSX\GL\glutils\fbo.cpp" />
<ClCompile Include="Emu\RSX\GL\GLVertexProgram.cpp" /> <ClCompile Include="Emu\RSX\GL\glutils\program.cpp" />
<ClCompile Include="Emu\RSX\GL\GLHelpers.cpp" /> <ClCompile Include="Emu\RSX\GL\glutils\ring_buffer.cpp" />
<ClCompile Include="Emu\RSX\GL\GLPresent.cpp" /> <ClCompile Include="Emu\RSX\GL\glutils\image.cpp" />
<ClCompile Include="Emu\RSX\GL\GLRenderTargets.cpp" /> <ClCompile Include="Emu\RSX\GL\glutils\sampler.cpp" />
<ClCompile Include="Emu\RSX\GL\GLShaderInterpreter.cpp" /> <ClCompile Include="Emu\RSX\GL\GLVertexProgram.cpp" />
<ClCompile Include="Emu\RSX\GL\OpenGL.cpp" /> <ClCompile Include="Emu\RSX\GL\GLHelpers.cpp" />
<ClCompile Include="Emu\RSX\GL\GLTexture.cpp" /> <ClCompile Include="Emu\RSX\GL\GLPresent.cpp" />
<ClCompile Include="Emu\RSX\GL\GLVertexBuffers.cpp" /> <ClCompile Include="Emu\RSX\GL\GLRenderTargets.cpp" />
<ClCompile Include="Emu\RSX\GL\GLTextureCache.cpp" /> <ClCompile Include="Emu\RSX\GL\GLShaderInterpreter.cpp" />
</ItemGroup> <ClCompile Include="Emu\RSX\GL\OpenGL.cpp" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ClCompile Include="Emu\RSX\GL\GLTexture.cpp" />
<ImportGroup Label="ExtensionTargets"> <ClCompile Include="Emu\RSX\GL\GLVertexBuffers.cpp" />
</ImportGroup> <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> </Project>

View file

@ -1,109 +1,130 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<ClCompile Include="Emu\RSX\GL\GLDraw.cpp" /> <ClCompile Include="Emu\RSX\GL\GLDraw.cpp" />
<ClCompile Include="Emu\RSX\GL\GLTexture.cpp" /> <ClCompile Include="Emu\RSX\GL\GLTexture.cpp" />
<ClCompile Include="Emu\RSX\GL\GLHelpers.cpp" /> <ClCompile Include="Emu\RSX\GL\GLHelpers.cpp" />
<ClCompile Include="Emu\RSX\GL\GLCommonDecompiler.cpp" /> <ClCompile Include="Emu\RSX\GL\GLCommonDecompiler.cpp" />
<ClCompile Include="Emu\RSX\GL\GLFragmentProgram.cpp" /> <ClCompile Include="Emu\RSX\GL\GLFragmentProgram.cpp" />
<ClCompile Include="Emu\RSX\GL\GLGSRender.cpp" /> <ClCompile Include="Emu\RSX\GL\GLGSRender.cpp" />
<ClCompile Include="Emu\RSX\GL\GLVertexProgram.cpp" /> <ClCompile Include="Emu\RSX\GL\GLVertexProgram.cpp" />
<ClCompile Include="Emu\RSX\GL\OpenGL.cpp" /> <ClCompile Include="Emu\RSX\GL\OpenGL.cpp" />
<ClCompile Include="Emu\RSX\GL\GLPresent.cpp" /> <ClCompile Include="Emu\RSX\GL\GLPresent.cpp" />
<ClCompile Include="Emu\RSX\GL\GLRenderTargets.cpp" /> <ClCompile Include="Emu\RSX\GL\GLRenderTargets.cpp" />
<ClCompile Include="Emu\RSX\GL\GLShaderInterpreter.cpp" /> <ClCompile Include="Emu\RSX\GL\GLShaderInterpreter.cpp" />
<ClCompile Include="Emu\RSX\GL\GLVertexBuffers.cpp" /> <ClCompile Include="Emu\RSX\GL\GLVertexBuffers.cpp" />
<ClCompile Include="Emu\RSX\GL\GLPipelineCompiler.cpp" /> <ClCompile Include="Emu\RSX\GL\GLPipelineCompiler.cpp" />
<ClCompile Include="Emu\RSX\GL\GLTextureCache.cpp" /> <ClCompile Include="Emu\RSX\GL\GLTextureCache.cpp" />
<ClCompile Include="Emu\RSX\GL\GLOverlays.cpp" /> <ClCompile Include="Emu\RSX\GL\GLOverlays.cpp" />
<ClCompile Include="Emu\RSX\GL\GLCompute.cpp" /> <ClCompile Include="Emu\RSX\GL\GLCompute.cpp" />
<ClCompile Include="Emu\RSX\GL\glutils\buffer_object.cpp"> <ClCompile Include="Emu\RSX\GL\glutils\buffer_object.cpp">
<Filter>glutils</Filter> <Filter>glutils</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="Emu\RSX\GL\glutils\ring_buffer.cpp"> <ClCompile Include="Emu\RSX\GL\glutils\ring_buffer.cpp">
<Filter>glutils</Filter> <Filter>glutils</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="Emu\RSX\GL\glutils\image.cpp"> <ClCompile Include="Emu\RSX\GL\glutils\image.cpp">
<Filter>glutils</Filter> <Filter>glutils</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="Emu\RSX\GL\glutils\common.cpp"> <ClCompile Include="Emu\RSX\GL\glutils\common.cpp">
<Filter>glutils</Filter> <Filter>glutils</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="Emu\RSX\GL\glutils\blitter.cpp"> <ClCompile Include="Emu\RSX\GL\glutils\blitter.cpp">
<Filter>glutils</Filter> <Filter>glutils</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="Emu\RSX\GL\glutils\fbo.cpp"> <ClCompile Include="Emu\RSX\GL\glutils\fbo.cpp">
<Filter>glutils</Filter> <Filter>glutils</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="Emu\RSX\GL\glutils\program.cpp"> <ClCompile Include="Emu\RSX\GL\glutils\program.cpp">
<Filter>glutils</Filter> <Filter>glutils</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="Emu\RSX\GL\glutils\sampler.cpp"> <ClCompile Include="Emu\RSX\GL\glutils\sampler.cpp">
<Filter>glutils</Filter> <Filter>glutils</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="Emu\RSX\GL\glutils\capabilities.cpp"> <ClCompile Include="Emu\RSX\GL\glutils\capabilities.cpp">
<Filter>glutils</Filter> <Filter>glutils</Filter>
</ClCompile> </ClCompile>
</ItemGroup> <ClCompile Include="Emu\RSX\GL\upscalers\fsr1\fsr_pass.cpp">
<ItemGroup> <Filter>upscalers\fsr1</Filter>
<ClInclude Include="Emu\RSX\GL\GLTexture.h" /> </ClCompile>
<ClInclude Include="Emu\RSX\GL\GLHelpers.h" /> </ItemGroup>
<ClInclude Include="Emu\RSX\GL\GLCommonDecompiler.h" /> <ItemGroup>
<ClInclude Include="Emu\RSX\GL\GLFragmentProgram.h" /> <ClInclude Include="Emu\RSX\GL\GLTexture.h" />
<ClInclude Include="Emu\RSX\GL\GLGSRender.h" /> <ClInclude Include="Emu\RSX\GL\GLHelpers.h" />
<ClInclude Include="Emu\RSX\GL\GLProcTable.h" /> <ClInclude Include="Emu\RSX\GL\GLCommonDecompiler.h" />
<ClInclude Include="Emu\RSX\GL\GLProgramBuffer.h" /> <ClInclude Include="Emu\RSX\GL\GLFragmentProgram.h" />
<ClInclude Include="Emu\RSX\GL\GLVertexProgram.h" /> <ClInclude Include="Emu\RSX\GL\GLGSRender.h" />
<ClInclude Include="Emu\RSX\GL\OpenGL.h" /> <ClInclude Include="Emu\RSX\GL\GLProcTable.h" />
<ClInclude Include="Emu\RSX\GL\GLTextureCache.h" /> <ClInclude Include="Emu\RSX\GL\GLProgramBuffer.h" />
<ClInclude Include="Emu\RSX\GL\GLRenderTargets.h" /> <ClInclude Include="Emu\RSX\GL\GLVertexProgram.h" />
<ClInclude Include="Emu\RSX\GL\GLShaderInterpreter.h" /> <ClInclude Include="Emu\RSX\GL\OpenGL.h" />
<ClInclude Include="Emu\RSX\GL\GLOverlays.h" /> <ClInclude Include="Emu\RSX\GL\GLTextureCache.h" />
<ClInclude Include="Emu\RSX\GL\GLCompute.h" /> <ClInclude Include="Emu\RSX\GL\GLRenderTargets.h" />
<ClInclude Include="Emu\RSX\GL\GLPipelineCompiler.h" /> <ClInclude Include="Emu\RSX\GL\GLShaderInterpreter.h" />
<ClInclude Include="Emu\RSX\GL\glutils\buffer_object.h"> <ClInclude Include="Emu\RSX\GL\GLOverlays.h" />
<Filter>glutils</Filter> <ClInclude Include="Emu\RSX\GL\GLCompute.h" />
</ClInclude> <ClInclude Include="Emu\RSX\GL\GLPipelineCompiler.h" />
<ClInclude Include="Emu\RSX\GL\glutils\ring_buffer.h"> <ClInclude Include="Emu\RSX\GL\glutils\buffer_object.h">
<Filter>glutils</Filter> <Filter>glutils</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="Emu\RSX\GL\glutils\common.h"> <ClInclude Include="Emu\RSX\GL\glutils\ring_buffer.h">
<Filter>glutils</Filter> <Filter>glutils</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="Emu\RSX\GL\glutils\capabilities.h"> <ClInclude Include="Emu\RSX\GL\glutils\common.h">
<Filter>glutils</Filter> <Filter>glutils</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="Emu\RSX\GL\glutils\image.h"> <ClInclude Include="Emu\RSX\GL\glutils\capabilities.h">
<Filter>glutils</Filter> <Filter>glutils</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="Emu\RSX\GL\glutils\state_tracker.hpp"> <ClInclude Include="Emu\RSX\GL\glutils\image.h">
<Filter>glutils</Filter> <Filter>glutils</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="Emu\RSX\GL\glutils\pixel_settings.hpp"> <ClInclude Include="Emu\RSX\GL\glutils\state_tracker.hpp">
<Filter>glutils</Filter> <Filter>glutils</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="Emu\RSX\GL\glutils\blitter.h"> <ClInclude Include="Emu\RSX\GL\glutils\pixel_settings.hpp">
<Filter>glutils</Filter> <Filter>glutils</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="Emu\RSX\GL\glutils\fbo.h"> <ClInclude Include="Emu\RSX\GL\glutils\blitter.h">
<Filter>glutils</Filter> <Filter>glutils</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="Emu\RSX\GL\glutils\vao.hpp"> <ClInclude Include="Emu\RSX\GL\glutils\fbo.h">
<Filter>glutils</Filter> <Filter>glutils</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="Emu\RSX\GL\glutils\program.h"> <ClInclude Include="Emu\RSX\GL\glutils\vao.hpp">
<Filter>glutils</Filter> <Filter>glutils</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="Emu\RSX\GL\glutils\sync.hpp"> <ClInclude Include="Emu\RSX\GL\glutils\program.h">
<Filter>glutils</Filter> <Filter>glutils</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="Emu\RSX\GL\glutils\sampler.h"> <ClInclude Include="Emu\RSX\GL\glutils\sync.hpp">
<Filter>glutils</Filter> <Filter>glutils</Filter>
</ClInclude> </ClInclude>
</ItemGroup> <ClInclude Include="Emu\RSX\GL\glutils\sampler.h">
<ItemGroup> <Filter>glutils</Filter>
<Filter Include="glutils"> </ClInclude>
<UniqueIdentifier>{ed9ef6b7-efbb-4a8e-88a4-583b6655c141}</UniqueIdentifier> <ClInclude Include="Emu\RSX\GL\upscalers\upscaling.h">
</Filter> <Filter>upscalers</Filter>
</ItemGroup> </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> </Project>

View file

@ -109,11 +109,6 @@
<Project>{c4a10229-4712-4bd2-b63e-50d93c67a038}</Project> <Project>{c4a10229-4712-4bd2-b63e-50d93c67a038}</Project>
</ProjectReference> </ProjectReference>
</ItemGroup> </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"> <PropertyGroup Label="Globals">
<ProjectGuid>{3EE5F075-B546-42C4-B6A8-E3CCEF38B78D}</ProjectGuid> <ProjectGuid>{3EE5F075-B546-42C4-B6A8-E3CCEF38B78D}</ProjectGuid>
<Keyword>Win32Proj</Keyword> <Keyword>Win32Proj</Keyword>

View file

@ -185,15 +185,4 @@
<UniqueIdentifier>{8387b0fc-178f-4c9c-9cf2-03df99ce4df2}</UniqueIdentifier> <UniqueIdentifier>{8387b0fc-178f-4c9c-9cf2-03df99ce4df2}</UniqueIdentifier>
</Filter> </Filter>
</ItemGroup> </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> </Project>

View file

@ -944,6 +944,9 @@
<None Include="Emu\RSX\Program\GLSLSnippets\RSXProg\RSXVertexPrologue.glsl" /> <None Include="Emu\RSX\Program\GLSLSnippets\RSXProg\RSXVertexPrologue.glsl" />
<None Include="Emu\RSX\Program\GLSLSnippets\ShuffleBytes.glsl" /> <None Include="Emu\RSX\Program\GLSLSnippets\ShuffleBytes.glsl" />
<None Include="Emu\RSX\Program\GLSLSnippets\VideoOutCalibrationPass.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> </ItemGroup>
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

View file

@ -91,6 +91,12 @@
<Filter Include="Emu\GPU\RSX\Overlays\Network"> <Filter Include="Emu\GPU\RSX\Overlays\Network">
<UniqueIdentifier>{d7a60dc0-ac4e-4983-97d3-ce1328af49a7}</UniqueIdentifier> <UniqueIdentifier>{d7a60dc0-ac4e-4983-97d3-ce1328af49a7}</UniqueIdentifier>
</Filter> </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>
<ItemGroup> <ItemGroup>
<ClCompile Include="Crypto\aes.cpp"> <ClCompile Include="Crypto\aes.cpp">
@ -2514,5 +2520,14 @@
<None Include="Emu\RSX\Program\GLSLSnippets\VideoOutCalibrationPass.glsl"> <None Include="Emu\RSX\Program\GLSLSnippets\VideoOutCalibrationPass.glsl">
<Filter>Emu\GPU\RSX\Program\Snippets</Filter> <Filter>Emu\GPU\RSX\Program\Snippets</Filter>
</None> </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> </ItemGroup>
</Project> </Project>