diff --git a/gitlab/image.docker b/gitlab/image.docker index e2135159b..ab89dd71f 100644 --- a/gitlab/image.docker +++ b/gitlab/image.docker @@ -89,7 +89,7 @@ RUN export DEBIAN_FRONTEND=noninteractive; \ rm -fr mesa && \ apt-get clean && \ - curl -L -s https://github.com/microsoft/DirectXShaderCompiler/releases/download/v1.8.2407/linux_dxc_2024_07_31.x86_64.tar.gz | tar zx -C /usr/local ./lib/libdxcompiler.so ./lib/libdxil.so && \ + curl -L -s https://github.com/microsoft/DirectXShaderCompiler/releases/download/v1.8.2502/linux_dxc_2025_02_20.x86_64.tar.gz | tar zx -C /usr/local ./lib/libdxcompiler.so ./lib/libdxil.so && \ groupadd host-render -g 800 && \ useradd -m gitlab -G host-render diff --git a/gitlab/image.yml b/gitlab/image.yml index d7782c3c4..2c51cf074 100644 --- a/gitlab/image.yml +++ b/gitlab/image.yml @@ -41,11 +41,12 @@ image-mac: - mkdir image/dxc - mkdir image/moltenvk - # The specified commit includes the open sourced libdxil.dylib, - # which is not available yet in any released version - - git clone --recursive https://github.com/microsoft/DirectXShaderCompiler.git + # The specified commit includes an update to the DirectXShaderCompiler's + # CMakeList.txt which makes it compatible with cmake (4+). + - git clone https://github.com/microsoft/DirectXShaderCompiler.git - cd DirectXShaderCompiler - - git checkout dfa1c814cc4c912ba982854b72f64527baa3e7e5 + - git checkout 3035d316c35289b68e8fc9d8cf21d86a204fb0e2 + - git submodule update --init --recursive - mkdir build - cd build - cmake .. -C ../cmake/caches/PredefinedParams.cmake -D CMAKE_BUILD_TYPE=Release diff --git a/gitlab/test.yml b/gitlab/test.yml index a8fb4203d..340e700da 100644 --- a/gitlab/test.yml +++ b/gitlab/test.yml @@ -42,7 +42,7 @@ test-win-64-dxc: variables: VKD3D_TEST_DEBUG: '1' script: - - 'Invoke-WebRequest -Uri "https://github.com/microsoft/DirectXShaderCompiler/releases/download/v1.8.2407/dxc_2024_07_31.zip" -OutFile ".\dxc.zip"' + - 'Invoke-WebRequest -Uri "https://github.com/microsoft/DirectXShaderCompiler/releases/download/v1.8.2502/dxc_2025_02_20.zip" -OutFile ".\dxc.zip"' - 'Expand-Archive -Path "dxc.zip" -DestinationPath ".\dxc"' - '$Env:PATH += ";" + (Convert-Path ".\dxc\bin\x64")' - git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec './artifacts/driver.cross64.exe $(git cherry $CI_MERGE_REQUEST_DIFF_BASE_SHA HEAD^ | wc -l) $(git rev-parse --short HEAD)' diff --git a/tests/hlsl/entry-point-semantics.shader_test b/tests/hlsl/entry-point-semantics.shader_test index ac25dd589..405e7bc7d 100644 --- a/tests/hlsl/entry-point-semantics.shader_test +++ b/tests/hlsl/entry-point-semantics.shader_test @@ -227,7 +227,7 @@ probe (0, 0) rgba (1.0, 2.0, 10.0, 20.0) % Output semantics cannot be mapped to more than one value. -[vertex shader fail(sm<6)] +[vertex shader fail] struct apple { float2 tex : TEXCOORD0;