RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-25 04:02:42 +01:00
Code Issues Releases Wiki Activity

rsx/vk: Refactor FSR integration to support multiple backends

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
rpcs3/Emu/RSX/VK/upscalers/fsr1/fsr_ffx_a_flattened.inc → rpcs3/Emu/RSX/Program/Upscalers/FSR1/fsr_ffx_a_flattened.inc
View File

0
rpcs3/Emu/RSX/VK/upscalers/fsr1/fsr_ffx_fsr1_flattened.inc → rpcs3/Emu/RSX/Program/Upscalers/FSR1/fsr_ffx_fsr1_flattened.inc
View File

0
rpcs3/Emu/RSX/VK/upscalers/fsr1/fsr_ubershader.glsl → rpcs3/Emu/RSX/Program/Upscalers/FSR1/fsr_ubershader.glsl
View File

6
rpcs3/Emu/RSX/VK/upscalers/fsr1/fsr_pass.cpp
View File

@ -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;

5
rpcs3/GLGSRender.vcxproj
View File

@ -79,6 +79,10 @@
<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" />
@ -106,6 +110,7 @@
<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">

21
rpcs3/GLGSRender.vcxproj.filters
View File

@ -44,6 +44,9 @@
<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" />
@ -100,10 +103,28 @@
<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>

5
rpcs3/VKGSRender.vcxproj
View File

@ -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>

11
rpcs3/VKGSRender.vcxproj.filters
View File

@ -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>

3
rpcs3/emucore.vcxproj
View File

@ -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" />

15
rpcs3/emucore.vcxproj.filters
View File

@ -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>