Skip to content

Commit

Permalink
build: Downstream Vulkan-Tools 1.3.302
Browse files Browse the repository at this point in the history
  • Loading branch information
MathiasMagnus committed Dec 3, 2024
2 parents 5a1a825 + 2ed61c1 commit 41d5b25
Show file tree
Hide file tree
Showing 33 changed files with 3,221 additions and 1,520 deletions.
39 changes: 29 additions & 10 deletions .github/workflows/tools.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Copyright (c) 2021-2023 Valve Corporation
# Copyright (c) 2021-2023 LunarG, Inc.
# Copyright (c) 2021-2024 Valve Corporation
# Copyright (c) 2021-2024 LunarG, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -29,31 +29,47 @@ concurrency:
cancel-in-progress: true

jobs:
linux:
linux:
needs: tools_codegen
runs-on: ${{matrix.os}}

strategy:
matrix:
cc: [ gcc ]
cxx: [ g++ ]
config: [ Debug, Release ]
os: [ ubuntu-20.04, ubuntu-22.04 ]
os: [ ubuntu-22.04, ubuntu-22.04 ]
include:
# Test clang on ubuntu 22
- cc: clang
cxx: clang++
config: Debug
os: ubuntu-22.04
# Test clang on ubuntu 24
- cc: clang
cxx: clang++
config: Release
os: ubuntu-24.04


steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.7'
python-version: '3.10'
- 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 }}
# This is to combat a bug when using 6.6 linux kernels with thread/address sanitizer
# https://github.com/google/sanitizers/issues/1716
- run: sudo sysctl vm.mmap_rnd_bits=28
- name: Configure
run: |
cmake -S. -B build -G "Ninja" \
Expand All @@ -62,7 +78,7 @@ jobs:
-D BUILD_WERROR=ON \
-D INSTALL_ICD=ON \
-D BUILD_TESTS=ON \
-D ENABLE_ADDRESS_SANITIZER=OFF # Re-enable when github CI doesn't have fatal issues
-D ENABLE_ADDRESS_SANITIZER=ON
env:
CC: ${{matrix.cc}}
CXX: ${{matrix.cxx}}
Expand All @@ -86,7 +102,8 @@ jobs:
- run: scripts/update_deps.py --dir ext --no-build
- run: scripts/generate_source.py --verify ext/Vulkan-Headers/registry/

windows:
windows:
needs: tools_codegen
runs-on: ${{matrix.os}}

strategy:
Expand All @@ -99,7 +116,7 @@ jobs:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.7'
python-version: '3.10'
- uses: lukka/get-cmake@latest
- uses: ilammy/msvc-dev-cmd@v1
with:
Expand All @@ -119,6 +136,7 @@ jobs:
run: ctest --output-on-failure

mingw:
needs: tools_codegen
runs-on: windows-latest
defaults:
run:
Expand Down Expand Up @@ -146,13 +164,14 @@ jobs:
- run: cmake --install build --prefix build/install

tools_codegen:
needs: codegen
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- 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
2 changes: 0 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,6 @@ if(VULKANSC AND BUILD_VKSC_DEVSIM)
add_subdirectory(devsim)
endif()

add_subdirectory(windows-runtime-installer)

if(BUILD_TESTS)
enable_testing()
add_subdirectory(tests)
Expand Down
Loading

0 comments on commit 41d5b25

Please sign in to comment.