video_core: Refactor GPU interface (#7272)

* video_core: Refactor GPU interface

* citra_qt: Better debug widget lifetime

CMakeModules/GenerateSCMRev.cmake

@@ -26,16 +26,14 @@ set(HASH_FILES
     "${VIDEO_CORE}/shader/generator/spv_fs_shader_gen.h"
     "${VIDEO_CORE}/shader/shader.cpp"
     "${VIDEO_CORE}/shader/shader.h"
-    "${VIDEO_CORE}/pica.cpp"
-    "${VIDEO_CORE}/pica.h"
-    "${VIDEO_CORE}/regs_framebuffer.h"
-    "${VIDEO_CORE}/regs_lighting.h"
-    "${VIDEO_CORE}/regs_pipeline.h"
-    "${VIDEO_CORE}/regs_rasterizer.h"
-    "${VIDEO_CORE}/regs_shader.h"
-    "${VIDEO_CORE}/regs_texturing.h"
-    "${VIDEO_CORE}/regs.cpp"
-    "${VIDEO_CORE}/regs.h"
+    "${VIDEO_CORE}/pica/regs_framebuffer.h"
+    "${VIDEO_CORE}/pica/regs_lighting.h"
+    "${VIDEO_CORE}/pica/regs_pipeline.h"
+    "${VIDEO_CORE}/pica/regs_rasterizer.h"
+    "${VIDEO_CORE}/pica/regs_shader.h"
+    "${VIDEO_CORE}/pica/regs_texturing.h"
+    "${VIDEO_CORE}/pica/regs_internal.cpp"
+    "${VIDEO_CORE}/pica/regs_internal.h"
 )
 set(COMBINED "")
 foreach (F IN LISTS HASH_FILES)

src/android/app/src/main/jni/emu_window/emu_window.cpp

@@ -15,7 +15,6 @@
 #include "jni/input_manager.h"
 #include "network/network.h"
 #include "video_core/renderer_base.h"
-#include "video_core/video_core.h"
 
 static bool IsPortraitMode() {
     return JNI_FALSE != IDCache::GetEnvForThread()->CallStaticBooleanMethod(

src/android/app/src/main/jni/emu_window/emu_window.h

@@ -7,6 +7,10 @@
 #include <vector>
 #include "core/frontend/emu_window.h"
 
+namespace Core {
+class System;
+}
+
 class EmuWindow_Android : public Frontend::EmuWindow {
 public:
     EmuWindow_Android(ANativeWindow* surface);

src/android/app/src/main/jni/emu_window/emu_window_gl.cpp

@@ -12,10 +12,11 @@
 
 #include "common/logging/log.h"
 #include "common/settings.h"
+#include "core/core.h"
 #include "input_common/main.h"
 #include "jni/emu_window/emu_window_gl.h"
+#include "video_core/gpu.h"
 #include "video_core/renderer_base.h"
-#include "video_core/video_core.h"
 
 static constexpr std::array<EGLint, 15> egl_attribs{EGL_SURFACE_TYPE,
                                                     EGL_WINDOW_BIT,
@@ -71,8 +72,8 @@ class SharedContext_Android : public Frontend::GraphicsContext {
     EGLContext egl_context{};
 };
 
-EmuWindow_Android_OpenGL::EmuWindow_Android_OpenGL(ANativeWindow* surface)
-    : EmuWindow_Android{surface} {
+EmuWindow_Android_OpenGL::EmuWindow_Android_OpenGL(Core::System& system_, ANativeWindow* surface)
+    : EmuWindow_Android{surface}, system{system_} {
     if (egl_display = eglGetDisplay(EGL_DEFAULT_DISPLAY); egl_display == EGL_NO_DISPLAY) {
         LOG_CRITICAL(Frontend, "eglGetDisplay() failed");
         return;
@@ -199,6 +200,9 @@ void EmuWindow_Android_OpenGL::StopPresenting() {
 }
 
 void EmuWindow_Android_OpenGL::TryPresenting() {
+    if (!system.IsPoweredOn()) {
+        return;
+    }
     if (presenting_state == PresentingState::Initial) [[unlikely]] {
         eglMakeCurrent(egl_display, egl_surface, egl_surface, egl_context);
         glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
@@ -208,8 +212,6 @@ void EmuWindow_Android_OpenGL::TryPresenting() {
         return;
     }
     eglSwapInterval(egl_display, Settings::values.use_vsync_new ? 1 : 0);
-    if (VideoCore::g_renderer) {
-        VideoCore::g_renderer->TryPresent(0);
-        eglSwapBuffers(egl_display, egl_surface);
-    }
+    system.GPU().Renderer().TryPresent(0);
+    eglSwapBuffers(egl_display, egl_surface);
 }

src/android/app/src/main/jni/emu_window/emu_window_gl.h

@@ -11,11 +11,15 @@
 
 #include "jni/emu_window/emu_window.h"
 
+namespace Core {
+class System;
+}
+
 struct ANativeWindow;
 
 class EmuWindow_Android_OpenGL : public EmuWindow_Android {
 public:
-    EmuWindow_Android_OpenGL(ANativeWindow* surface);
+    EmuWindow_Android_OpenGL(Core::System& system, ANativeWindow* surface);
     ~EmuWindow_Android_OpenGL() override = default;
 
     void TryPresenting() override;
@@ -30,6 +34,7 @@ class EmuWindow_Android_OpenGL : public EmuWindow_Android {
     void DestroyContext() override;
 
 private:
+    Core::System& system;
     EGLConfig egl_config;
     EGLSurface egl_surface{};
     EGLContext egl_context{};

src/android/app/src/main/jni/emu_window/emu_window_vk.cpp

@@ -7,7 +7,6 @@
 #include "common/logging/log.h"
 #include "common/settings.h"
 #include "jni/emu_window/emu_window_vk.h"
-#include "video_core/video_core.h"
 
 class GraphicsContext_Android final : public Frontend::GraphicsContext {
 public:

src/android/app/src/main/jni/native.cpp

@@ -51,8 +51,9 @@
 #include "jni/id_cache.h"
 #include "jni/input_manager.h"
 #include "jni/ndk_motion.h"
+#include "video_core/debug_utils/debug_utils.h"
+#include "video_core/gpu.h"
 #include "video_core/renderer_base.h"
-#include "video_core/video_core.h"
 
 #if CITRA_ARCH(arm64)
 #include <adrenotools/driver.h>
@@ -126,7 +127,7 @@ static bool CheckMicPermission() {
 
 static Core::System::ResultStatus RunCitra(const std::string& filepath) {
     // Citra core only supports a single running instance
-    std::lock_guard<std::mutex> lock(running_mutex);
+    std::scoped_lock lock(running_mutex);
 
     LOG_INFO(Frontend, "Citra starting...");
 
@@ -137,10 +138,12 @@ static Core::System::ResultStatus RunCitra(const std::string& filepath) {
         return Core::System::ResultStatus::ErrorLoader;
     }
 
+    Core::System& system{Core::System::GetInstance()};
+
     const auto graphics_api = Settings::values.graphics_api.GetValue();
     switch (graphics_api) {
     case Settings::GraphicsAPI::OpenGL:
-        window = std::make_unique<EmuWindow_Android_OpenGL>(s_surf);
+        window = std::make_unique<EmuWindow_Android_OpenGL>(system, s_surf);
         break;
     case Settings::GraphicsAPI::Vulkan:
         window = std::make_unique<EmuWindow_Android_Vulkan>(s_surf, vulkan_library);
@@ -150,8 +153,6 @@ static Core::System::ResultStatus RunCitra(const std::string& filepath) {
         window = std::make_unique<EmuWindow_Android_Vulkan>(s_surf, vulkan_library);
     }
 
-    Core::System& system{Core::System::GetInstance()};
-
     // Forces a config reload on game boot, if the user changed settings in the UI
     Config{};
     // Replace with game-specific settings
@@ -179,6 +180,7 @@ static Core::System::ResultStatus RunCitra(const std::string& filepath) {
     // Register microphone permission check
     system.RegisterMicPermissionCheck(&CheckMicPermission);
 
+    Pica::g_debug_context = Pica::DebugContext::Construct();
     InputManager::Init();
 
     window->MakeCurrent();
@@ -196,7 +198,7 @@ static Core::System::ResultStatus RunCitra(const std::string& filepath) {
     LoadDiskCacheProgress(VideoCore::LoadCallbackStage::Prepare, 0, 0);
 
     std::unique_ptr<Frontend::GraphicsContext> cpu_context;
-    system.Renderer().Rasterizer()->LoadDiskResources(stop_run, &LoadDiskCacheProgress);
+    system.GPU().Renderer().Rasterizer()->LoadDiskResources(stop_run, &LoadDiskCacheProgress);
 
     LoadDiskCacheProgress(VideoCore::LoadCallbackStage::Complete, 0, 0);
 
@@ -275,8 +277,10 @@ void Java_org_citra_citra_1emu_NativeLibrary_surfaceChanged(JNIEnv* env,
     if (window) {
         window->OnSurfaceChanged(s_surf);
     }
-    if (VideoCore::g_renderer) {
-        VideoCore::g_renderer->NotifySurfaceChanged();
+
+    auto& system = Core::System::GetInstance();
+    if (system.IsPoweredOn()) {
+        system.GPU().Renderer().NotifySurfaceChanged();
     }
 
     LOG_INFO(Frontend, "Surface changed");
@@ -311,8 +315,9 @@ void Java_org_citra_citra_1emu_NativeLibrary_notifyOrientationChange([[maybe_unu
                                                                      jint layout_option,
                                                                      jint rotation) {
     Settings::values.layout_option = static_cast<Settings::LayoutOption>(layout_option);
-    if (VideoCore::g_renderer) {
-        VideoCore::g_renderer->UpdateCurrentFramebufferLayout(!(rotation % 2));
+    auto& system = Core::System::GetInstance();
+    if (system.IsPoweredOn()) {
+        system.GPU().Renderer().UpdateCurrentFramebufferLayout(!(rotation % 2));
     }
     InputManager::screen_rotation = rotation;
     Camera::NDK::g_rotation = rotation;
@@ -322,8 +327,9 @@ void Java_org_citra_citra_1emu_NativeLibrary_swapScreens([[maybe_unused]] JNIEnv
                                                          [[maybe_unused]] jobject obj,
                                                          jboolean swap_screens, jint rotation) {
     Settings::values.swap_screen = swap_screens;
-    if (VideoCore::g_renderer) {
-        VideoCore::g_renderer->UpdateCurrentFramebufferLayout(!(rotation % 2));
+    auto& system = Core::System::GetInstance();
+    if (system.IsPoweredOn()) {
+        system.GPU().Renderer().UpdateCurrentFramebufferLayout(!(rotation % 2));
     }
     InputManager::screen_rotation = rotation;
     Camera::NDK::g_rotation = rotation;

src/citra/citra.cpp

@@ -36,6 +36,7 @@
 #include "core/telemetry_session.h"
 #include "input_common/main.h"
 #include "network/network.h"
+#include "video_core/gpu.h"
 #include "video_core/renderer_base.h"
 
 #ifdef __unix__
@@ -438,9 +439,10 @@ int main(int argc, char** argv) {
         movie.StartRecording(movie_record, movie_record_author);
     }
     if (!dump_video.empty() && DynamicLibrary::FFmpeg::LoadFFmpeg()) {
+        auto& renderer = system.GPU().Renderer();
         const auto layout{
-            Layout::FrameLayoutFromResolutionScale(system.Renderer().GetResolutionScaleFactor())};
-        auto dumper = std::make_shared<VideoDumper::FFmpegBackend>();
+            Layout::FrameLayoutFromResolutionScale(renderer.GetResolutionScaleFactor())};
+        auto dumper = std::make_shared<VideoDumper::FFmpegBackend>(renderer);
         if (dumper->StartDumping(dump_video, layout)) {
             system.RegisterVideoDumper(dumper);
         }
@@ -458,7 +460,7 @@ int main(int argc, char** argv) {
     });
 
     std::atomic_bool stop_run;
-    system.Renderer().Rasterizer()->LoadDiskResources(
+    system.GPU().Renderer().Rasterizer()->LoadDiskResources(
         stop_run, [](VideoCore::LoadCallbackStage stage, std::size_t value, std::size_t total) {
             LOG_DEBUG(Frontend, "Loading stage {} progress {} {}", static_cast<u32>(stage), value,
                       total);

src/citra/emu_window/emu_window_sdl2_gl.cpp

@@ -11,8 +11,9 @@
 #include "citra/emu_window/emu_window_sdl2_gl.h"
 #include "common/scm_rev.h"
 #include "common/settings.h"
+#include "core/core.h"
+#include "video_core/gpu.h"
 #include "video_core/renderer_base.h"
-#include "video_core/video_core.h"
 
 class SDLGLContext : public Frontend::GraphicsContext {
 public:
@@ -159,7 +160,7 @@ void EmuWindow_SDL2_GL::Present() {
     SDL_GL_MakeCurrent(render_window, window_context);
     SDL_GL_SetSwapInterval(1);
     while (IsOpen()) {
-        VideoCore::g_renderer->TryPresent(100, is_secondary);
+        system.GPU().Renderer().TryPresent(100, is_secondary);
         SDL_GL_SwapWindow(render_window);
     }
     SDL_GL_MakeCurrent(render_window, nullptr);

src/citra/emu_window/emu_window_sdl2_sw.cpp

@@ -13,6 +13,7 @@
 #include "common/settings.h"
 #include "core/core.h"
 #include "core/frontend/emu_window.h"
+#include "video_core/gpu.h"
 #include "video_core/renderer_software/renderer_software.h"
 
 class DummyContext : public Frontend::GraphicsContext {};
@@ -94,7 +95,7 @@ void EmuWindow_SDL2_SW::Present() {
 }
 
 SDL_Surface* EmuWindow_SDL2_SW::LoadFramebuffer(VideoCore::ScreenId screen_id) {
-    const auto& renderer = static_cast<SwRenderer::RendererSoftware&>(system.Renderer());
+    const auto& renderer = static_cast<SwRenderer::RendererSoftware&>(system.GPU().Renderer());
     const auto& info = renderer.Screen(screen_id);
     const int width = static_cast<int>(info.width);
     const int height = static_cast<int>(info.height);

src/citra_qt/bootmanager.cpp

@@ -22,9 +22,9 @@
 #include "input_common/main.h"
 #include "input_common/motion_emu.h"
 #include "video_core/custom_textures/custom_tex_manager.h"
+#include "video_core/gpu.h"
 #include "video_core/renderer_base.h"
 #include "video_core/renderer_software/renderer_software.h"
-#include "video_core/video_core.h"
 
 #ifdef HAS_OPENGL
 #include <glad/glad.h>
@@ -73,7 +73,7 @@ void EmuThread::run() {
 
     emit LoadProgress(VideoCore::LoadCallbackStage::Prepare, 0, 0);
 
-    system.Renderer().Rasterizer()->LoadDiskResources(
+    system.GPU().Renderer().Rasterizer()->LoadDiskResources(
         stop_run, [this](VideoCore::LoadCallbackStage stage, std::size_t value, std::size_t total) {
             emit LoadProgress(stage, value, total);
         });
@@ -284,9 +284,7 @@ class OpenGLRenderWidget : public RenderWidget {
         }
         context->MakeCurrent();
         glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0);
-        if (VideoCore::g_renderer) {
-            VideoCore::g_renderer->TryPresent(100, is_secondary);
-        }
+        system.GPU().Renderer().TryPresent(100, is_secondary);
         context->SwapBuffers();
         glFinish();
     }
@@ -367,7 +365,7 @@ struct SoftwareRenderWidget : public RenderWidget {
     }
 
     QImage LoadFramebuffer(VideoCore::ScreenId screen_id) {
-        const auto& renderer = static_cast<SwRenderer::RendererSoftware&>(system.Renderer());
+        const auto& renderer = static_cast<SwRenderer::RendererSoftware&>(system.GPU().Renderer());
         const auto& info = renderer.Screen(screen_id);
         const int width = static_cast<int>(info.width);
         const int height = static_cast<int>(info.height);
@@ -678,13 +676,14 @@ void GRenderWindow::ReleaseRenderTarget() {
 }
 
 void GRenderWindow::CaptureScreenshot(u32 res_scale, const QString& screenshot_path) {
+    auto& renderer = system.GPU().Renderer();
     if (res_scale == 0) {
-        res_scale = system.Renderer().GetResolutionScaleFactor();
+        res_scale = renderer.GetResolutionScaleFactor();
     }
 
     const auto layout{Layout::FrameLayoutFromResolutionScale(res_scale, is_secondary)};
     screenshot_image = QImage(QSize(layout.width, layout.height), QImage::Format_RGB32);
-    system.Renderer().RequestScreenshot(
+    renderer.RequestScreenshot(
         screenshot_image.bits(),
         [this, screenshot_path](bool invert_y) {
             const std::string std_screenshot_path = screenshot_path.toStdString();

src/citra_qt/configuration/configure_graphics.cpp

@@ -20,7 +20,6 @@ ConfigureGraphics::ConfigureGraphics(std::span<const QString> physical_devices,
         ui->physical_device_combo->addItem(name);
     }
 
-    ui->toggle_vsync_new->setEnabled(!is_powered_on);
     ui->graphics_api_combo->setEnabled(!is_powered_on);
     ui->physical_device_combo->setEnabled(!is_powered_on);
     ui->toggle_async_shaders->setEnabled(!is_powered_on);