From ca309e439af67345d6adecab60d4a1dc3eb7bfa1 Mon Sep 17 00:00:00 2001 From: Giovanni Mascellani Date: Wed, 16 Oct 2024 12:06:19 +0200 Subject: [PATCH] ci: Test DXIL shaders on macOS. This unfortunately introduces a lot of failures, because it turns out there is still work to do there. But at least we can estimate how bad we're doing. --- gitlab/build-mac | 2 +- gitlab/build.yml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gitlab/build-mac b/gitlab/build-mac index 374bf228..ef97ccf6 100755 --- a/gitlab/build-mac +++ b/gitlab/build-mac @@ -11,7 +11,7 @@ rm -fr build mkdir build cd build if ../configure CFLAGS="-I/opt/homebrew/opt/vulkan-headers/include -I/opt/homebrew/opt/spirv-headers/include -g -O2 -Wno-implicit-fallthrough -Wno-ignored-attributes -Wno-unknown-attributes -Wno-unused-but-set-variable -Werror" \ - CPPFLAGS="-DVKD3D_ABORT_ON_ERR -DVKD3D_SHADER_UNSUPPORTED_MSL" \ + CPPFLAGS="-DVKD3D_ABORT_ON_ERR -DVKD3D_SHADER_UNSUPPORTED_DXIL -DVKD3D_SHADER_UNSUPPORTED_MSL" \ VULKAN_LIBS=-L/opt/homebrew/opt/vulkan-loader/lib --with-spirv-tools && \ make -j$(sysctl -n hw.ncpu) ; then make -j$(sysctl -n hw.ncpu) AM_COLOR_TESTS=always check || \ diff --git a/gitlab/build.yml b/gitlab/build.yml index feed0ff6..98599ca0 100644 --- a/gitlab/build.yml +++ b/gitlab/build.yml @@ -157,6 +157,7 @@ build-mac: - mkdir artifacts - export PATH="/opt/homebrew/opt/bison/bin:/opt/homebrew/opt/flex/bin:$PATH" - export VK_DRIVER_FILES="$PWD/image/moltenvk/MoltenVK_icd.json" + - export SONAME_LIBDXCOMPILER="$PWD/image/dxc/libdxcompiler.dylib" - system_profiler SPSoftwareDataType SPHardwareDataType > artifacts/systeminfo.txt - vulkaninfo > artifacts/vulkaninfo.txt - git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec ./gitlab/build-mac