GPU: Split backend into Backend+Presenter

stenzek · Jan 18, 2025 · d52bf79 · d52bf79
1 parent 8f19ac2
commit d52bf79
Show file tree

Hide file tree

Showing 18 changed files with 1,498 additions and 1,355 deletions.
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -57,6 +57,8 @@ add_library(core
   gpu_hw_shadergen.h
   gpu_hw_texture_cache.cpp
   gpu_hw_texture_cache.h
+  gpu_presenter.cpp
+  gpu_presenter.h
   gpu_shadergen.cpp
   gpu_shadergen.h
   gpu_sw.cpp

diff --git a/src/core/core.vcxproj b/src/core/core.vcxproj
@@ -38,6 +38,7 @@
     <ClCompile Include="gpu_dump.cpp" />
     <ClCompile Include="gpu_hw_shadergen.cpp" />
     <ClCompile Include="gpu_hw_texture_cache.cpp" />
+    <ClCompile Include="gpu_presenter.cpp" />
     <ClCompile Include="gpu_shadergen.cpp" />
     <ClCompile Include="gpu_sw.cpp" />
     <ClCompile Include="gpu_sw_rasterizer.cpp" />
@@ -116,6 +117,7 @@
     <ClInclude Include="gpu_dump.h" />
     <ClInclude Include="gpu_hw_shadergen.h" />
     <ClInclude Include="gpu_hw_texture_cache.h" />
+    <ClInclude Include="gpu_presenter.h" />
     <ClInclude Include="gpu_shadergen.h" />
     <ClInclude Include="gpu_sw.h" />
     <ClInclude Include="gpu_sw_rasterizer.h" />

diff --git a/src/core/core.vcxproj.filters b/src/core/core.vcxproj.filters
@@ -66,6 +66,7 @@
     <ClCompile Include="jogcon.cpp" />
     <ClCompile Include="pio.cpp" />
     <ClCompile Include="gpu_thread.cpp" />
+    <ClCompile Include="gpu_presenter.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="types.h" />
@@ -142,6 +143,7 @@
     <ClInclude Include="pio.h" />
     <ClInclude Include="gpu_thread.h" />
     <ClInclude Include="gpu_thread_commands.h" />
+    <ClInclude Include="gpu_presenter.h" />
   </ItemGroup>
   <ItemGroup>
     <None Include="gpu_sw_rasterizer.inl" />

diff --git a/src/core/fullscreen_ui.cpp b/src/core/fullscreen_ui.cpp
@@ -8329,8 +8329,8 @@ LoadingScreenProgressCallback::~LoadingScreenProgressCallback()
   }
   else
   {
-    // since this was pushing frames, we need to restore the context
-    GPUThread::Internal::RestoreContextAfterPresent();
+    // since this was pushing frames, we need to restore the context. do that by pushing a frame ourselves
+    GPUThread::Internal::DoRunIdle();
   }
 }
 

diff --git a/src/core/gpu.cpp b/src/core/gpu.cpp
@@ -2062,7 +2062,7 @@ bool GPU::StartRecordingGPUDump(const char* path, u32 num_frames /* = 1 */)
 
   // save screenshot to same location to identify it
   GPUBackend::RenderScreenshotToFile(Path::ReplaceExtension(path, "png"), DisplayScreenshotMode::ScreenResolution, 85,
-                                     true, false);
+                                     false);
   return true;
 }