diff --git a/.github/workflows/APK-Release.yml b/.github/workflows/APK-Release.yml index 49ce4cf4..bf2ec47a 100644 --- a/.github/workflows/APK-Release.yml +++ b/.github/workflows/APK-Release.yml @@ -25,16 +25,9 @@ jobs: ref: ${{ github.sha }} fetch-depth: 0 - - name: Prepare Vulkan SDK - uses: humbletim/setup-vulkan-sdk@v1.2.1 - with: - vulkan-query-version: 1.3.296.0 - vulkan-components: Glslang, SPIRV-Tools - vulkan-use-cache: true - - name: Install dependencies run: | - sudo apt-get update && sudo apt-get install glslang-tools librsvg2-bin gettext npm + sudo apt-get update && sudo apt-get install glslang-tools spirv-tools librsvg2-bin gettext npm wget https://github.com/KhronosGroup/KTX-Software/releases/download/v4.4.0/KTX-Software-4.4.0-Linux-x86_64.deb sudo dpkg --install KTX-Software-4.4.0-Linux-x86_64.deb npm install --global @gltf-transform/cli@4.1.1 diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index da376320..86d5ae66 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -30,7 +30,6 @@ jobs: # Perfetto SDK glue don't bitrot (WIVRN_TRACE_MONADO needs percetto, not packaged in CI) - preset: 'server-tracing' packages: libboost-all-dev libsystemd-dev - perfetto: true - preset: 'server-no-systemd' packages: libboost-all-dev - preset: 'server-no-system-boost' @@ -42,7 +41,7 @@ jobs: - name: Apt dependencies uses: awalsh128/cache-apt-pkgs-action@v1.6.1 with: - packages: ccache ${{matrix.config.packages}} ${{ startsWith(matrix.config.preset, 'server') && env.SERVER_DEPS || ''}} + packages: ccache libvulkan-dev glslang-tools spirv-tools libwayland-dev libxrandr-dev ${{matrix.config.packages}} ${{ startsWith(matrix.config.preset, 'server') && env.SERVER_DEPS || ''}} - name: ccache uses: hendrikmuhs/ccache-action@v1.2.23 @@ -69,15 +68,8 @@ jobs: sudo dpkg --install KTX-Software-4.4.2-Linux-x86_64.deb npm install --global @gltf-transform/cli@4.1.1 - - name: Prepare Vulkan SDK - uses: humbletim/setup-vulkan-sdk@v1.2.1 - with: - vulkan-query-version: 1.3.296.0 - vulkan-components: Vulkan-Headers, Vulkan-Loader, Glslang, SPIRV-Reflect, SPIRV-Tools - vulkan-use-cache: true - - name: Fetch Perfetto SDK - if: ${{ matrix.config.perfetto }} + if: ${{ matrix.config.preset == 'server-tracing' }} # The amalgamated SDK is two files; install them where server/CMakeLists.txt looks. env: PERFETTO_TAG: v51.0 @@ -192,13 +184,6 @@ jobs: with: fetch-depth: 0 - - name: Prepare Vulkan SDK - uses: humbletim/setup-vulkan-sdk@v1.2.1 - with: - vulkan-query-version: 1.3.296.0 - vulkan-components: Glslang, SPIRV-Tools - vulkan-use-cache: true - - uses: actions/cache@v5 with: key: cmake-android-${{matrix.buildtype}} @@ -212,7 +197,7 @@ jobs: - name: Install dependencies run: | - sudo apt-get update && sudo apt-get install glslang-tools librsvg2-bin gettext + sudo apt-get update && sudo apt-get install glslang-tools spirv-tools librsvg2-bin gettext wget https://github.com/KhronosGroup/KTX-Software/releases/download/v4.3.2/KTX-Software-4.3.2-Linux-x86_64.deb sudo dpkg --install KTX-Software-4.3.2-Linux-x86_64.deb npm install --global @gltf-transform/cli diff --git a/CMakeLists.txt b/CMakeLists.txt index 8ddb7d23..57b16fd5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -123,8 +123,8 @@ endif() if (WIVRN_BUILD_SERVER) find_program(GDBUS_CODEGEN gdbus-codegen REQUIRED) - if (Vulkan_VERSION VERSION_LESS "1.3.261") - message(FATAL_ERROR "Vulkan version must be at least 1.3.261, found ${Vulkan_VERSION}") + if (Vulkan_VERSION VERSION_LESS "1.4.304") + message(FATAL_ERROR "Vulkan version must be at least 1.4.304, found ${Vulkan_VERSION}") endif() if (NOT WIVRN_USE_NVENC AND NOT WIVRN_USE_VAAPI AND NOT WIVRN_USE_X264 AND NOT WIVRN_USE_VULKAN_ENCODE) @@ -136,12 +136,6 @@ if (WIVRN_BUILD_SERVER) pkg_check_modules(LIBDRM REQUIRED IMPORTED_TARGET libdrm) endif() - if (WIVRN_USE_VULKAN_ENCODE) - if (Vulkan_VERSION VERSION_LESS 1.3.283) - message(FATAL_ERROR "Vulkan video encode requires 1.3.283, found ${Vulkan_VERSION}") - endif() - endif() - if (WIVRN_USE_X264) pkg_check_modules(X264 REQUIRED IMPORTED_TARGET x264) endif() diff --git a/debian/control b/debian/control index dc17a4ef..5e444d43 100644 --- a/debian/control +++ b/debian/control @@ -29,7 +29,7 @@ Build-Depends: libsystemd-dev, libudev-dev, libva-dev, - libvulkan-dev (>= 1.3.261), + libvulkan-dev (>= 1.4.304), libwayland-dev, libx11-xcb-dev, libx264-dev, diff --git a/server/utils/wivrn_vk_bundle.cpp b/server/utils/wivrn_vk_bundle.cpp index a99000b3..6c0b2104 100644 --- a/server/utils/wivrn_vk_bundle.cpp +++ b/server/utils/wivrn_vk_bundle.cpp @@ -36,15 +36,9 @@ namespace { VkBool32 message_callback( -#if VK_HEADER_VERSION >= 304 vk::DebugUtilsMessageSeverityFlagBitsEXT messageSeverity, vk::DebugUtilsMessageTypeFlagsEXT messageTypes, const vk::DebugUtilsMessengerCallbackDataEXT * pCallbackData, -#else - VkDebugUtilsMessageSeverityFlagBitsEXT messageSeverity, - VkDebugUtilsMessageTypeFlagsEXT messageTypes, - const VkDebugUtilsMessengerCallbackDataEXT * pCallbackData, -#endif void * pUserData) { u_logging_level level = U_LOGGING_ERROR;