-
Notifications
You must be signed in to change notification settings - Fork 154
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
cube: Support runtime selection of WSI platform
By changing the selection of a WSI platform from a build time choice to a runtime choice, this allows the removal of vkcube-wayland as a separate binary. Use `--wsi <platform>` to choose the WSI platform that vkcube will render with. The chosen platform must be one that vkcube was compiled with support for, so directfb will be unavailable without changing the build parameters to enable it. These changes have been made to both vkcube and vkcubepp.
- Loading branch information
1 parent
4c63e84
commit 615c292
Showing
9 changed files
with
2,118 additions
and
876 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -38,26 +38,17 @@ jobs: | |
cxx: [ g++ ] | ||
config: [ Debug, Release ] | ||
os: [ ubuntu-20.04, ubuntu-22.04 ] | ||
cube_wsi: [ XCB ] | ||
include: | ||
# Test WAYLAND | ||
- cc: gcc | ||
cxx: g++ | ||
config: Release | ||
os: ubuntu-22.04 | ||
cube_wsi: WAYLAND | ||
# Test clang on ubuntu 20 with XLIB | ||
# Test clang on ubuntu 20 | ||
- cc: clang | ||
cxx: clang++ | ||
config: Debug | ||
os: ubuntu-20.04 | ||
cube_wsi: XLIB | ||
# Test clang on ubuntu 22 with the DISPLAY option | ||
# Test clang on ubuntu 22 | ||
- cc: clang | ||
cxx: clang++ | ||
config: Release | ||
os: ubuntu-22.04 | ||
cube_wsi: DISPLAY | ||
|
||
|
||
steps: | ||
|
@@ -67,19 +58,18 @@ jobs: | |
python-version: '3.7' | ||
- run: | | ||
sudo apt-get -qq update | ||
sudo apt install libwayland-dev xorg-dev wayland-protocols | ||
sudo apt install --yes libwayland-dev xorg-dev wayland-protocols | ||
- uses: lukka/get-cmake@latest | ||
with: | ||
cmakeVersion: 3.17.2 | ||
- name: Setup ccache | ||
uses: hendrikmuhs/[email protected] | ||
with: | ||
key: ${{ runner.os }}-${{ matrix.config }}-${{ matrix.cc }}-${{matrix.cube_wsi}} | ||
key: ${{ runner.os }}-${{ matrix.config }}-${{ matrix.cc }} | ||
- name: Configure | ||
run: | | ||
cmake -S. -B build -G "Ninja" \ | ||
-D CMAKE_BUILD_TYPE=${{matrix.config}} \ | ||
-D CUBE_WSI_SELECTION=${{matrix.cube_wsi}} \ | ||
-D UPDATE_DEPS=ON \ | ||
-D BUILD_WERROR=ON \ | ||
-D INSTALL_ICD=ON \ | ||
|
@@ -231,7 +221,7 @@ jobs: | |
- uses: actions/setup-python@v5 | ||
with: | ||
python-version: '3.10' | ||
- run: sudo apt-get -qq update && sudo apt install libwayland-dev xorg-dev wayland-protocols | ||
- run: sudo apt-get -qq update && sudo apt install --yes libwayland-dev xorg-dev wayland-protocols | ||
- run: cmake -S . -B build/ -D UPDATE_DEPS=ON -D UPDATE_DEPS_DIR=external -D TOOLS_CODEGEN=ON | ||
- run: cmake --build build --target tools_codegen | ||
- run: git diff --exit-code | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.