Update parallel-rdp WSI integration (#61)

* Update parallel-rdp WSI integration

* fix build

* disable mac build

.github/workflows/build.yml

@@ -48,24 +48,23 @@ jobs:
         with:
           name: gopher64-windows
           path: target/release/gopher64.exe
-
-  build-macos:
-    runs-on: macos-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: recursive
-      - name: Install sdl2 headers
-        run: |
-          brew install sdl2
-      - name: Update rust
-        run: |
-          rustup update
-      - name: Build
-        run: |
-          cargo build --release -v
-      - name: Upload file
-        uses: actions/upload-artifact@v4
-        with:
-          name: gopher64-mac
-          path: target/release/gopher64
+#  build-macos:
+#    runs-on: macos-13
+#    steps:
+#      - uses: actions/checkout@v4
+#        with:
+#          submodules: recursive
+#      - name: Install sdl2 headers
+#        run: |
+#          brew install sdl2
+#      - name: Update rust
+#        run: |
+#         rustup update
+#      - name: Build
+#        run: |
+#          cargo build --release -v
+#      - name: Upload file
+#        uses: actions/upload-artifact@v4
+#        with:
+#          name: gopher64-mac
+#          path: target/release/gopher64

Cargo.toml

@@ -1,20 +1,20 @@
 [package]
 name = "gopher64"
-version = "0.1.3"
+version = "0.1.6"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 dirs = "5.0"
-zip = "0.6"
+zip = "2.1"
 governor = "0.6"
-sevenz-rust = "0.5"
+sevenz-rust = "0.6"
 chrono = "0.4"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-eframe = "0.25"
-rfd = {version = "0.13",  default-features = false, features = ["xdg-portal", "async-std"] }
+eframe = "0.27"
+rfd = "0.14"
 sha2 = "0.10"
 rusttype = "0.9"
 futures = "0.3"

README.md

@@ -56,4 +56,4 @@ Gopher64 is licensed under the GPLv3 license. Many portions of gopher64 have bee
 
 ## where to download
 
-Builds can be found as artifacts on [GitHub Actions](https://github.com/gopher64/gopher64/actions?query=branch%3Amain)
+https://github.com/gopher64/gopher64/releases

build.rs

@@ -37,6 +37,7 @@ fn main() {
         .file("parallel-rdp/parallel-rdp-standalone/util/aligned_alloc.cpp")
         .file("parallel-rdp/parallel-rdp-standalone/util/timer.cpp")
         .file("parallel-rdp/parallel-rdp-standalone/util/timeline_trace_file.cpp")
+        .file("parallel-rdp/parallel-rdp-standalone/util/environment.cpp")
         .file("parallel-rdp/parallel-rdp-standalone/util/thread_name.cpp")
         .file("parallel-rdp/parallel-rdp-standalone/volk/volk.c")
         .file("parallel-rdp/interface.cpp")

parallel-rdp/wsi_platform.cpp

@@ -54,6 +54,11 @@ void SDL_WSIPlatform::poll_input()
 	SDL_PumpEvents();
 }
 
+void SDL_WSIPlatform::poll_input_async(Granite::InputTrackerHandler *handler)
+{
+	SDL_PumpEvents();
+}
+
 void SDL_WSIPlatform::set_window(SDL_Window *_window)
 {
 	window = _window;

parallel-rdp/wsi_platform.hpp

@@ -13,10 +13,10 @@ public:
 	uint32_t get_surface_height() override;
 	bool alive(Vulkan::WSI &wsi) override;
 	void poll_input() override;
+	void poll_input_async(Granite::InputTrackerHandler *handler) override;
 	void set_window(SDL_Window *_window);
 	void do_resize();
 
 private:
-	VkSurfaceKHR surface;
 	SDL_Window *window;
 };

rust-toolchain.toml

@@ -1,2 +0,0 @@
-[toolchain]
-channel = "nightly"

src/ui/storage.rs

@@ -97,27 +97,27 @@ pub fn init(ui: &mut ui::Ui) {
         panic!("could not create save dir")
     }
 
-    ui.paths.eep_file_path = base_path.clone();
+    ui.paths.eep_file_path.clone_from(&base_path);
     ui.paths
         .eep_file_path
         .push(ui.game_id.to_owned() + "-" + &ui.game_hash + ".eep");
 
-    ui.paths.sra_file_path = base_path.clone();
+    ui.paths.sra_file_path.clone_from(&base_path);
     ui.paths
         .sra_file_path
         .push(ui.game_id.to_owned() + "-" + &ui.game_hash + ".sra");
 
-    ui.paths.fla_file_path = base_path.clone();
+    ui.paths.fla_file_path.clone_from(&base_path);
     ui.paths
         .fla_file_path
         .push(ui.game_id.to_owned() + "-" + &ui.game_hash + ".fla");
 
-    ui.paths.pak_file_path = base_path.clone();
+    ui.paths.pak_file_path.clone_from(&base_path);
     ui.paths
         .pak_file_path
         .push(ui.game_id.to_owned() + "-" + &ui.game_hash + ".mpk");
 
-    ui.paths.romsave_file_path = base_path.clone();
+    ui.paths.romsave_file_path.clone_from(&base_path);
     ui.paths
         .romsave_file_path
         .push(ui.game_id.to_owned() + "-" + &ui.game_hash + ".romsave");