Merge branch 'master' into jit-rs

Author: Dillonb

.github/workflows/build.yml

@@ -64,7 +64,7 @@ jobs:
         run: |
           mkdir -p tmp
           cd tmp
-          wget https://raw.githubusercontent.com/DragonMinded/libdragon/trunk/tools/chksum64.c
+          wget https://raw.githubusercontent.com/DragonMinded/libdragon/8c4e8505778a5c84e5477394eddfb127ce44d71b/tools/chksum64.c
           gcc chksum64.c -o chksum64
           sudo mv chksum64 /bin/
           git clone https://github.com/ARM9/bass.git

flake.lock

@@ -41,6 +41,9 @@
         pkgs.bzip2
       ] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [
         pkgs.darwin.apple_sdk.frameworks.Cocoa
+      ] ++ pkgs.lib.optionals (!pkgs.stdenv.isDarwin) [
+        pkgs.qt6.qtbase # TODO: Qt should work on Darwin too
+        pkgs.qt6.wrapQtAppsHook
       ];
       stdenv =
         if pkgs.stdenv.isLinux then pkgs.stdenv
@@ -85,6 +88,7 @@
           postInstall =
             if pkgs.stdenv.isLinux then ''
               wrapProgram $out/bin/n64 --set LD_LIBRARY_PATH ${pkgs.vulkan-loader}/lib
+              wrapProgram $out/bin/n64-qt --set LD_LIBRARY_PATH ${pkgs.vulkan-loader}/lib
             '' else if pkgs.stdenv.isDarwin then ''
               wrapProgram $out/bin/n64 --set DYLD_FALLBACK_LIBRARY_PATH ${pkgs.darwin.moltenvk}/lib
             '' else throw "Unsupported platform";
@@ -96,6 +100,11 @@
         program = "${self.packages.${system}.default}/bin/n64";
       };
 
+      apps.qt = {
+        type = "app";
+        program = "${self.packages.${system}.default}/bin/n64-qt";
+      };
+
       devShells.default = pkgs.mkShell.override { stdenv = stdenv; }
         {
           buildInputs = devShellTools ++ tools ++ libs;

flake.nix

@@ -20,4 +20,4 @@ https://github.com/btzy/nativefiledialog-extended
 
 https://github.com/Themaister/parallel-rdp-standalone
 
-7e5ad30b8c6e5b863c117997c459441649da9bc7
+d1cc912c5c47abaf9b6b155d3cd15255df65cf5b

src/contrib/UPSTREAM.md

@@ -1 +1 @@
-fe5becd13638873db90d46e7ba7d48255971f82a
+1f69c762be68feb9fcd5276d75acc6e5a6160a19

src/contrib/parallel-rdp/parallel-rdp-standalone/COMMIT

@@ -201,6 +201,11 @@ bool Renderer::init_caps()
 			LOGW("Current proprietary Intel Windows driver is tested to perform much better without 8/16-bit integer support.\n");
 			allow_small_types = false;
 		}
+		else if (features.driver_id == VK_DRIVER_ID_QUALCOMM_PROPRIETARY_KHR)
+		{
+			LOGW("Current proprietary Qcom driver is known to be buggy with 8/16-bit integer arithmetic, disabling support for time being.\n");
+			allow_small_types = false;
+		}
 
 		// Intel ANV *must* use small integer arithmetic, or it doesn't pass test suite.
 	}

src/contrib/parallel-rdp/parallel-rdp-standalone/parallel-rdp/rdp_renderer.cpp

@@ -889,6 +889,12 @@ void Device::init_workarounds()
 		LOGW("Disabling pipeline cache control.\n");
 		workarounds.broken_pipeline_cache_control = true;
 	}
+	else if (ext.driver_id == VK_DRIVER_ID_QUALCOMM_PROPRIETARY_KHR)
+	{
+		// Seems broken on this driver too. Compilation stutter galore ...
+		LOGW("Disabling pipeline cache control.\n");
+		workarounds.broken_pipeline_cache_control = true;
+	}
 
 	if (sync2_workarounds)
 	{

src/contrib/parallel-rdp/parallel-rdp-standalone/vulkan/device.cpp

@@ -8,10 +8,13 @@ add_executable(${N64_QT_TARGET}
         mainwindow.cpp  mainwindow.h mainwindow.ui
         vulkan_pane.cpp vulkan_pane.h
         qt_wsi_platform.cpp qt_wsi_platform.h
-        n64_emulator_thread.cpp n64_emulator_thread.h)
+        n64_emulator_thread.cpp n64_emulator_thread.h
+        ../frontend/tas_movie.c
+        ../common/perf_map_file.c)
 target_link_libraries(${N64_TARGET}-qt Qt6::Widgets Qt6::Gui Qt6::Core common core parallel_rdp_wrapper parallel-rdp)
 
 set_target_properties(${N64_QT_TARGET}
         PROPERTIES
         RUNTIME_OUTPUT_DIRECTORY "${N64_EXECUTABLE_OUTPUT_PATH}"
-)
+)
+install(TARGETS ${N64_QT_TARGET} RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)

src/qt_frontend/CMakeLists.txt

@@ -4,27 +4,31 @@
 #include "ui_mainwindow.h"
 #include "qt_wsi_platform.h"
 
-MainWindow::MainWindow(QWidget *parent)
+MainWindow::MainWindow(const char* rom_path, bool debug, bool interpreter, QWidget *parent)
         : QMainWindow(parent) {
     ui = new Ui::MainWindow();
     ui->setupUi(this);
+
+    vkPane = new VulkanPane();
+    setCentralWidget(vkPane);
+    vkPane->hide();
+
+    emulatorThread = std::make_unique<N64EmulatorThread>(vkPane->qtVkInstanceFactory.get(), vkPane->platform.get(), rom_path, debug, interpreter);
 }
 
 void MainWindow::showEvent(QShowEvent *event) {
     QWidget::showEvent(event);
-
-    vkPane = new VulkanPane();
-    vkPane->setSurfaceType(QSurface::VulkanSurface);
-    setCentralWidget(QWidget::createWindowContainer(vkPane, this));
 }
 
 void MainWindow::resetTriggered() {
-    vkPane->getEmulatorThread().reset();
+    emulatorThread->reset();
 }
 
 void MainWindow::openFileTriggered() {
     auto filename = QFileDialog::getOpenFileName(this, "Load ROM", QString(), "N64 ROM files (*.z64 *.n64 *.v64)");
     if (!filename.isEmpty()) {
-        vkPane->getEmulatorThread().loadRom(filename.toStdString());
+        vkPane->show();
+        emulatorThread->loadRom(filename.toStdString());
+        emulatorThread->start();
     }
 }

src/qt_frontend/mainwindow.cpp

@@ -20,10 +20,11 @@ class MainWindow : public QMainWindow
 Q_OBJECT
 
 public:
-    explicit MainWindow(QWidget *parent = nullptr);
+    explicit MainWindow(const char* rom_path = nullptr, bool debug = false, bool interpreter = false, QWidget *parent = nullptr);
     virtual ~MainWindow() {};
 
     void showEvent(QShowEvent* event) override;
+    std::unique_ptr<N64EmulatorThread> emulatorThread;
 
 public slots:
     void resetTriggered();

src/qt_frontend/mainwindow.h

@@ -4,6 +4,9 @@
 #include <frontend/audio.h>
 #include <frontend/render.h>
 #include "n64_emulator_thread.h"
+
+#include <QWindow>
+
 #include "qt_wsi_platform.h"
 
 class QtParallelRdpWindowInfo : public ParallelRdpWindowInfo {
@@ -19,9 +22,9 @@ class QtParallelRdpWindowInfo : public ParallelRdpWindowInfo {
     QWindow* pane;
 };
 
-N64EmulatorThread::N64EmulatorThread(QtWSIPlatform* wsiPlatform) {
-    this->wsiPlatform = wsiPlatform;
-    init_n64system(nullptr, true, false, QT_VULKAN_VIDEO_TYPE, false);
+N64EmulatorThread::N64EmulatorThread(Vulkan::InstanceFactory* instanceFactory, QtWSIPlatform* wsiPlatform, const char* rom_path, bool debug, bool interpreter)
+        : wsiPlatform(wsiPlatform), instanceFactory(instanceFactory) {
+    init_n64system(rom_path, true, debug, QT_VULKAN_VIDEO_TYPE, interpreter);
 
     if (file_exists(PIF_ROM_PATH)) {
         logalways("Found PIF ROM at %s, loading", PIF_ROM_PATH);
@@ -32,32 +35,30 @@ N64EmulatorThread::N64EmulatorThread(QtWSIPlatform* wsiPlatform) {
     }
 }
 
-void N64EmulatorThread::start() {
+void N64EmulatorThread::run() noexcept {
     if (n64_should_quit() || running) {
         logfatal("Tried to start emulator thread, but it was already running!");
     }
 
-    QtWSIPlatform* _wsiPlatform = this->wsiPlatform;
-    QWindow* pane = wsiPlatform->getPane();
     running = true;
-    bool* _game_loaded = &game_loaded;
-    emuThread = std::thread([_wsiPlatform, pane, _game_loaded]() {
-        init_vulkan_wsi(_wsiPlatform, std::make_unique<QtParallelRdpWindowInfo>(pane));
 
-        init_parallel_rdp();
+    init_vulkan_wsi(instanceFactory, wsiPlatform, std::make_unique<QtParallelRdpWindowInfo>(wsiPlatform->getWindowHandle()));
 
-        while (!(*_game_loaded)) {
-            std::this_thread::sleep_for(std::chrono::milliseconds(1000 / 60));
-            prdp_update_screen_no_game();
-        }
+    init_parallel_rdp();
 
-        n64_system_loop();
-    });
+    while (!game_loaded) {
+        std::this_thread::sleep_for(std::chrono::milliseconds(1000 / 60));
+        prdp_update_screen_no_game();
+    }
+
+    n64_system_loop();
 }
 
 void N64EmulatorThread::reset() {
-    if (running) {
-        n64_queue_reset();
+    if (game_loaded) {
+        reset_n64system();
+        n64_load_rom(n64sys.rom_path);
+        pif_rom_execute();
     }
 }
 

src/qt_frontend/n64_emulator_thread.cpp

@@ -3,20 +3,21 @@
 
 #undef signals
 #include <wsi.hpp>
+#include <QThread>
 
 class QtWSIPlatform;
-class N64EmulatorThread {
-public:
-    explicit N64EmulatorThread(QtWSIPlatform* wsiPlatform);
-    void start();
-    void reset();
-    void loadRom(const std::string& filename);
-
-private:
+class N64EmulatorThread : public QThread {
+    Q_OBJECT
     bool running = false;
     bool game_loaded = false;
     std::thread emuThread;
     QtWSIPlatform* wsiPlatform;
+    Vulkan::InstanceFactory* instanceFactory;
+public:
+    explicit N64EmulatorThread(Vulkan::InstanceFactory* instanceFactory, QtWSIPlatform* wsiPlatform, const char* rom_path = nullptr, bool debug = false, bool interpreter = false);
+    void run() noexcept override;
+    void reset();
+    void loadRom(const std::string& filename);
 };