Update parallel-rdp WSI integration (#61)
* Update parallel-rdp WSI integration * fix build * disable mac build
This commit is contained in:
parent
ce5ee30ef0
commit
4da7cd0551
41
.github/workflows/build.yml
vendored
41
.github/workflows/build.yml
vendored
@ -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
|
||||
|
||||
@ -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;
|
||||
|
||||
@ -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;
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user