From: Giovanni Mascellani gmascellani@codeweavers.com
--- Makefile.am | 2 +- gitlab/build.yml | 143 ------------------ ...lerp.shader_test => move_test.shader_test} | 0 3 files changed, 1 insertion(+), 144 deletions(-) rename tests/hlsl/{lerp.shader_test => move_test.shader_test} (100%)
diff --git a/Makefile.am b/Makefile.am index 002746829..8aa01406b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -116,7 +116,7 @@ vkd3d_shader_tests = \ tests/hlsl/is-front-face.shader_test \ tests/hlsl/ldexp.shader_test \ tests/hlsl/length.shader_test \ - tests/hlsl/lerp.shader_test \ + tests/hlsl/move_test.shader_test \ tests/hlsl/lit.shader_test \ tests/hlsl/load-level.shader_test \ tests/hlsl/log.shader_test \ diff --git a/gitlab/build.yml b/gitlab/build.yml index 9695a3042..ed16202d2 100644 --- a/gitlab/build.yml +++ b/gitlab/build.yml @@ -1,66 +1,3 @@ -.build-linux: - stage: build - rules: - - if: $CI_PIPELINE_SOURCE == 'merge_request_event' - image: $CI_REGISTRY/wine/vkd3d:debian-bookworm - interruptible: true - needs: - - job: build-image - optional: true - dependencies: [] - script: - - git config --global --add safe.directory $CI_PROJECT_DIR - - git clean -fdx - - git reset --hard - - rm -fr .git/rebase-merge - - mkdir artifacts - - cat /proc/cpuinfo > artifacts/cpuinfo.txt - - cat /proc/meminfo > artifacts/meminfo.txt - - vulkaninfo > artifacts/vulkaninfo.txt - - git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec ./gitlab/build-linux - - if [ -f build_failed ] ; then exit 1 ; fi - - if [ -f tests_failed ] ; then exit 2 ; fi - artifacts: - when: always - paths: - - artifacts - -build-radv-64: - extends: .build-linux - tags: - - amd-gpu - variables: - VK_LOADER_DRIVERS_SELECT: 'radeon_*' - VKD3D_SHADER_CONFIG: 'force_validation' - -build-llvmpipe-64: - extends: .build-linux - allow_failure: - exit_codes: - - 2 - variables: - VK_LOADER_DRIVERS_SELECT: 'lvp_*' - VKD3D_SHADER_CONFIG: 'force_validation' - -build-radv-32: - extends: .build-linux - tags: - - amd-gpu - variables: - VK_LOADER_DRIVERS_SELECT: 'radeon_*' - CC: 'gcc -m32' - VKD3D_SHADER_CONFIG: 'force_validation' - -build-llvmpipe-32: - extends: .build-linux - allow_failure: - exit_codes: - - 2 - variables: - VK_LOADER_DRIVERS_SELECT: 'lvp_*' - CC: 'gcc -m32' - VKD3D_SHADER_CONFIG: 'force_validation' - build-crosstest: stage: build rules: @@ -86,83 +23,3 @@ build-crosstest: when: always paths: - artifacts - -.build-mingw: - stage: build - rules: - - if: $CI_PIPELINE_SOURCE == 'merge_request_event' - image: $CI_REGISTRY/wine/vkd3d:debian-bookworm - interruptible: true - needs: - - job: build-image - optional: true - dependencies: [] - script: - - git config --global --add safe.directory $CI_PROJECT_DIR - - git clean -fdx - - git reset --hard - - rm -fr .git/rebase-merge - - mkdir artifacts - - cat /proc/cpuinfo > artifacts/cpuinfo.txt - - cat /proc/meminfo > artifacts/meminfo.txt - - git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec ./gitlab/build-mingw - - if [ -f pipeline_failed ] ; then exit 1 ; fi - artifacts: - when: always - paths: - - artifacts - -build-mingw-64: - extends: .build-mingw - variables: - HOST: "x86_64-w64-mingw32" - -build-mingw-32: - extends: .build-mingw - variables: - HOST: "i686-w64-mingw32" - -build-mac: - stage: build - rules: - - if: $CI_PIPELINE_SOURCE == 'merge_request_event' - allow_failure: - exit_codes: - - 2 - interruptible: true - needs: [] - dependencies: [] - tags: - - mac - script: - - git config --global --add safe.directory $CI_PROJECT_DIR - - git clean -fdx - - git reset --hard - - rm -fr .git/rebase-merge - # We use a custom ICD which is not marked as a portability driver, - # so that test programs are not confused. - - ./gitlab/patch_moltenvk_icd.sh - - export VK_DRIVER_FILES="$PWD/gitlab/MoltenVK_icd.json" - - mkdir artifacts - - system_profiler SPSoftwareDataType SPHardwareDataType > artifacts/systeminfo.txt - - vulkaninfo > artifacts/vulkaninfo.txt - - export PATH="/usr/local/opt/bison/bin:/usr/local/opt/flex/bin:$PATH" - - git clone --depth 1 --branch wine-3.21 https://gitlab.winehq.org/wine/wine.git - - cd wine - - mkdir build - - cd build - - ../configure --enable-win64 --without-x --without-freetype - - make tools/widl/widl - - cd ../.. - - export PATH="$PWD/wine/build/tools/widl:$PATH" - - git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec ./gitlab/build-mac - - if [ -f build_failed ] ; then exit 1 ; fi - - if [ -f tests_failed ] ; then exit 2 ; fi - variables: - VKD3D_DISABLE_EXTENSIONS: "VK_EXT_descriptor_indexing" - VKD3D_SHADER_CONFIG: 'force_validation' - MVK_CONFIG_LOG_LEVEL: 1 - artifacts: - when: always - paths: - - artifacts diff --git a/tests/hlsl/lerp.shader_test b/tests/hlsl/move_test.shader_test similarity index 100% rename from tests/hlsl/lerp.shader_test rename to tests/hlsl/move_test.shader_test