From b163cabc9487c68b6d6ed3af63f39eae27f982c2 Mon Sep 17 00:00:00 2001 From: Romaric Jodin <89833130+rjodinchr@users.noreply.github.com> Date: Sat, 16 Mar 2024 11:02:10 +0100 Subject: [PATCH] update dependencies (#19) --- .github/workflows/presubmit.yml | 8 ++++---- README.md | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/presubmit.yml b/.github/workflows/presubmit.yml index 2a33272..a4df313 100644 --- a/.github/workflows/presubmit.yml +++ b/.github/workflows/presubmit.yml @@ -36,8 +36,8 @@ jobs: sudo apt-get install ninja-build libvulkan-dev clang-15 mesa-vulkan-drivers - name: Build SPIRV-Tools run: | - git clone --depth 1 --branch vksp https://github.com/rjodinchr/SPIRV-Tools.git third_party/spirv-tools - git clone --depth 1 --branch vksp https://github.com/rjodinchr/SPIRV-Headers.git third_party/spirv-tools/external/spirv-headers + git clone --depth 1 --branch main https://github.com/KhronosGroup/SPIRV-Tools.git third_party/spirv-tools + git clone --depth 1 --branch main https://github.com/KhronosGroup/SPIRV-Headers.git third_party/spirv-tools/external/spirv-headers cmake -B third_party/spirv-tools/build -S third_party/spirv-tools/ -G Ninja \ -DCMAKE_CXX_COMPILER="$(which clang++)" \ -DCMAKE_BUILD_TYPE=Release @@ -45,7 +45,7 @@ jobs: cmake --install third_party/spirv-tools/build --prefix $(pwd)/install/ - name: Build Perfetto run: | - git clone --depth 1 --branch v39.0 https://android.googlesource.com/platform/external/perfetto third_party/perfetto + git clone --depth 1 --branch v43.2 https://android.googlesource.com/platform/external/perfetto third_party/perfetto $(pwd)/third_party/perfetto/tools/install-build-deps $(pwd)/third_party/perfetto/tools/setup_all_configs.py $(pwd)/third_party/perfetto/tools/ninja -C $(pwd)/third_party/perfetto/out/linux_clang_release libtrace_processor.a perfetto traced @@ -54,7 +54,7 @@ jobs: sudo apt-get install build-essential libx11-xcb-dev libxkbcommon-dev libwayland-dev libxrandr-dev - name: Build Vulkan-Loader run : | - git clone --depth 1 --branch v1.3.240 https://github.com/KhronosGroup/Vulkan-Loader.git third_party/vulkan-loader + git clone --depth 1 --branch v1.3.280 https://github.com/KhronosGroup/Vulkan-Loader.git third_party/vulkan-loader cmake -B third_party/vulkan-loader/build -S third_party/vulkan-loader -G Ninja \ -DVulkanHeaders_DIR=$(pwd)/install/share/cmake/VulkanHeaders \ -DCMAKE_CXX_COMPILER="$(which clang++)" \ diff --git a/README.md b/README.md index 0a63323..86ed490 100644 --- a/README.md +++ b/README.md @@ -31,8 +31,8 @@ Using the `vulkan-shader-profiler-extractor` and `vulkan-shader-profiler-runner` * [Vulkan-Loader](https://github.com/KhronosGroup/Vulkan-Loader) * [Vulkan-Headers](https://github.com/KhronosGroup/Vulkan-Headers) -* [SPIRV-Headers](https://github.com/KhronosGroup/SPIRV-Headers) (with https://github.com/KhronosGroup/SPIRV-Headers/pull/398) -* [SPIRV-Tools](https://github.com/KhronosGroup/SPIRV-Tools) (with https://github.com/KhronosGroup/SPIRV-Tools/pull/5512) +* [SPIRV-Headers](https://github.com/KhronosGroup/SPIRV-Headers) +* [SPIRV-Tools](https://github.com/KhronosGroup/SPIRV-Tools) * [perfetto](https://github.com/google/perfetto) `vulkan-kernel-profiler` also (obviously) depends on a Vulkan implementation.