wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-09-12 18:50:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

ci: Update the DXC version used on the CI to 1.8.2502.

Browse Source
This commit is contained in:
Francisco Casas
2025-04-29 13:43:07 -04:00
committed by Henri Verbeet
parent cb4b5641ea
commit 7b07d77396
Notes: Henri Verbeet 2025-05-06 19:05:34 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1477
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gitlab/image.docker
View File

@@ -89,7 +89,7 @@ RUN export DEBIAN_FRONTEND=noninteractive; \
rm -fr mesa && \ rm -fr mesa && \
apt-get clean && \ 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 && \ groupadd host-render -g 800 && \
useradd -m gitlab -G host-render useradd -m gitlab -G host-render

9
gitlab/image.yml
View File

@@ -41,11 +41,12 @@ image-mac:
- mkdir image/dxc - mkdir image/dxc
- mkdir image/moltenvk - mkdir image/moltenvk
# The specified commit includes the open sourced libdxil.dylib, # The specified commit includes an update to the DirectXShaderCompiler's
# which is not available yet in any released version # CMakeList.txt which makes it compatible with cmake (4+).
- git clone --recursive https://github.com/microsoft/DirectXShaderCompiler.git - git clone https://github.com/microsoft/DirectXShaderCompiler.git
- cd DirectXShaderCompiler - cd DirectXShaderCompiler
- git checkout dfa1c814cc4c912ba982854b72f64527baa3e7e5 - git checkout 3035d316c35289b68e8fc9d8cf21d86a204fb0e2
- git submodule update --init --recursive
- mkdir build - mkdir build
- cd build - cd build
- cmake .. -C ../cmake/caches/PredefinedParams.cmake -D CMAKE_BUILD_TYPE=Release - cmake .. -C ../cmake/caches/PredefinedParams.cmake -D CMAKE_BUILD_TYPE=Release

2
gitlab/test.yml
View File

@@ -42,7 +42,7 @@ test-win-64-dxc:
variables: variables:
VKD3D_TEST_DEBUG: '1' VKD3D_TEST_DEBUG: '1'
script: 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"' - 'Expand-Archive -Path "dxc.zip" -DestinationPath ".\dxc"'
- '$Env:PATH += ";" + (Convert-Path ".\dxc\bin\x64")' - '$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)' - 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)'

2
tests/hlsl/entry-point-semantics.shader_test
View File

@@ -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. % Output semantics cannot be mapped to more than one value.
[vertex shader fail(sm<6)] [vertex shader fail]
struct apple struct apple
{ {
float2 tex : TEXCOORD0; float2 tex : TEXCOORD0;