From 4da7cd055194023ee20eed832374156c6768fb37 Mon Sep 17 00:00:00 2001
From: Logan McNaughton <848146+loganmc10@users.noreply.github.com>
Date: Mon, 27 May 2024 13:23:56 -0600
Subject: [PATCH] Update parallel-rdp WSI integration (#61)

* Update parallel-rdp WSI integration

* fix build

* disable mac build
---
 .github/workflows/build.yml   | 41 +++++++++++++++++------------------
 parallel-rdp/wsi_platform.cpp |  5 +++++
 parallel-rdp/wsi_platform.hpp |  2 +-
 3 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 980c706..3e16b53 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -48,24 +48,23 @@ jobs:
         with:
           name: gopher64-windows
           path: target/release/gopher64.exe
-
-  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
+#  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
diff --git a/parallel-rdp/wsi_platform.cpp b/parallel-rdp/wsi_platform.cpp
index 8bf77ce..e7d2377 100644
--- a/parallel-rdp/wsi_platform.cpp
+++ b/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;
diff --git a/parallel-rdp/wsi_platform.hpp b/parallel-rdp/wsi_platform.hpp
index 9b82fc8..c8dbdf8 100644
--- a/parallel-rdp/wsi_platform.hpp
+++ b/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;
 };