.editorconfig

@@ -34,3 +34,8 @@ trim_trailing_whitespace = false
 [{meson.build,meson_options.txt}]
 indent_style = space
 indent_size = 2
+
+
+[*.ps1]
+indent_style = space
+indent_size = 2

.gitlab-ci/build/gitlab-ci.yml

@@ -72,6 +72,7 @@ debian-testing:
     VULKAN_DRIVERS: "swrast,amd,intel"
     BUILDTYPE: "debugoptimized"
     EXTRA_OPTION: >
+      -D spirv-to-dxil=true
       -D valgrind=false
     MINIO_ARTIFACT_NAME: mesa-amd64
   script:
@@ -156,6 +157,7 @@ debian-gallium:
     GALLIUM_DRIVERS: "iris,nouveau,kmsro,r300,r600,freedreno,swrast,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,d3d12,asahi,crocus"
     VULKAN_DRIVERS: swrast
     EXTRA_OPTION: >
+      -D spirv-to-dxil=true
       -D osmesa=true
       -D tools=drm-shim,etnaviv,freedreno,glsl,intel,intel-ui,nir,nouveau,xvmc,lima,panfrost,asahi
   script:
@@ -187,6 +189,7 @@ debian-release:
     VULKAN_DRIVERS: "amd,imagination-experimental"
     BUILDTYPE: "release"
     EXTRA_OPTION: >
+      -D spirv-to-dxil=true
       -D osmesa=true
       -D tools=all
       -D intel-clc=enabled
@@ -402,6 +405,7 @@ debian-clang:
     GALLIUM_DRIVERS: "iris,nouveau,kmsro,r300,r600,freedreno,swrast,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,radeonsi,tegra,d3d12,crocus,i915,asahi"
     VULKAN_DRIVERS: intel,amd,freedreno,broadcom,virtio-experimental,swrast,panfrost,imagination-experimental
     EXTRA_OPTIONS:
+      -D spirv-to-dxil=true
       -D imagination-srv=true
     CC: clang
     CXX: clang++
@@ -413,7 +417,7 @@ windows-vs2019:
     - .windows-build-rules
   stage: build-misc
   script:
-    - . .\.gitlab-ci\windows\mesa_build.ps1
+    - pwsh -ExecutionPolicy RemoteSigned .\.gitlab-ci\windows\mesa_build.ps1
   artifacts:
     paths:
       - _build/meson-logs/*.txt
@@ -519,6 +523,7 @@ debian-mingw32-x86_64:
     CPP_ARGS: $C_ARGS
     GALLIUM_DRIVERS: "swrast"
     EXTRA_OPTION: >
+      -D spirv-to-dxil=true
       -Dllvm=disabled
       -Dzlib=disabled
       -Dosmesa=true

.gitlab-ci/common/generate-env.sh

@@ -81,6 +81,7 @@ for var in \
     MESA_IMAGE \
     MESA_IMAGE_PATH \
     MESA_IMAGE_TAG \
+    MESA_LOADER_DRIVER_OVERRIDE \
     MESA_TEMPLATES_COMMIT \
     MESA_VK_IGNORE_CONFORMANCE_WARNING \
     MESA_SPIRV_LOG_LEVEL \

.gitlab-ci/container/build-hang-detection.sh

@@ -2,7 +2,7 @@
 
 set -ex
 
-PARALLEL_DEQP_RUNNER_VERSION=6596b71cf37a7efb4d54acd48c770ed2d4ad6b7e
+PARALLEL_DEQP_RUNNER_VERSION=fe557794b5dadd8dbf0eae403296625e03bda18a
 
 git clone https://gitlab.freedesktop.org/mesa/parallel-deqp-runner --single-branch -b master --no-checkout /parallel-deqp-runner
 pushd /parallel-deqp-runner

.gitlab-ci/container/build-piglit.sh

@@ -4,7 +4,7 @@ set -ex
 
 git clone https://gitlab.freedesktop.org/mesa/piglit.git --single-branch --no-checkout /piglit
 pushd /piglit
-git checkout 5e7d4a7b1df385f1e2b08b2b81d75f039e8be64b
+git checkout b2c9d8f56b45d79f804f4cb5ac62520f0edd8988
 patch -p1 <$OLDPWD/.gitlab-ci/piglit/disable-vs_in.diff
 cmake -S . -B . -G Ninja -DCMAKE_BUILD_TYPE=Release $PIGLIT_OPTS $EXTRA_CMAKE_ARGS
 ninja $PIGLIT_BUILD_TARGETS

.gitlab-ci/container/gitlab-ci.yml

@@ -366,16 +366,36 @@ debian/arm_test:
   script:
     - .\.gitlab-ci\windows\mesa_container.ps1 $CI_REGISTRY $CI_REGISTRY_USER $CI_REGISTRY_PASSWORD $MESA_IMAGE $MESA_UPSTREAM_IMAGE ${DOCKERFILE} ${MESA_BASE_IMAGE}
 
+windows_vs2019:
+  inherit:
+    default: false
+  extends:
+    - .windows_container_build
+  variables:
+    MESA_IMAGE_PATH: &windows_vs_image_path ${WINDOWS_X64_VS_PATH}
+    MESA_IMAGE_TAG: &windows_vs_image_tag ${WINDOWS_X64_VS_TAG}
+    DOCKERFILE: Dockerfile_vs
+    MESA_BASE_IMAGE: "mcr.microsoft.com/windows/server:ltsc2022"
+
 windows_build_vs2019:
   inherit:
     default: false
   extends:
     - .windows_container_build
+  rules:
+    - if: '$MICROSOFT_FARM == "offline"'
+      when: never
+    - !reference [.ci-run-policy, rules]
   variables:
     MESA_IMAGE_PATH: &windows_build_image_path ${WINDOWS_X64_BUILD_PATH}
     MESA_IMAGE_TAG: &windows_build_image_tag ${WINDOWS_X64_BUILD_TAG}
     DOCKERFILE: Dockerfile_build
+    MESA_BASE_IMAGE_PATH: *windows_vs_image_path
+    MESA_BASE_IMAGE_TAG: *windows_vs_image_tag
+    MESA_BASE_IMAGE: "$CI_REGISTRY_IMAGE/${MESA_BASE_IMAGE_PATH}:${MESA_BASE_IMAGE_TAG}"
   timeout: 2h 30m # LLVM takes ages
+  needs:
+    - windows_vs2019
 
 windows_test_vs2019:
   inherit:
@@ -390,12 +410,11 @@ windows_test_vs2019:
     MESA_IMAGE_PATH: &windows_test_image_path ${WINDOWS_X64_TEST_PATH}
     MESA_IMAGE_TAG: &windows_test_image_tag ${WINDOWS_X64_BUILD_TAG}--${WINDOWS_X64_TEST_TAG}
     DOCKERFILE: Dockerfile_test
-    # Right now this only needs the VS install to get DXIL.dll. Maybe see about decoupling this at some point
-    MESA_BASE_IMAGE_PATH: *windows_build_image_path
-    MESA_BASE_IMAGE_TAG: *windows_build_image_tag
+    MESA_BASE_IMAGE_PATH: *windows_vs_image_path
+    MESA_BASE_IMAGE_TAG: *windows_vs_image_tag
     MESA_BASE_IMAGE: "$CI_REGISTRY_IMAGE/${MESA_BASE_IMAGE_PATH}:${MESA_BASE_IMAGE_TAG}"
   needs:
-    - windows_build_vs2019
+    - windows_vs2019
 
 .use-windows_build_vs2019:
   inherit:

.gitlab-ci/crosvm-runner.sh

@@ -54,7 +54,7 @@ VM_SOCKET=crosvm-${THREAD}.sock
 # was terminated due to timeouts.  This "vm stop" may fail if the crosvm died
 # without cleaning itself up.
 if [ -e $VM_SOCKET ]; then
-   crosvm stop $VM_SOCKET || true
+   crosvm stop $VM_SOCKET || rm -rf $VM_SOCKET
    # Wait for socats from that invocation to drain
    sleep 5
 fi

.gitlab-ci/image-tags.yml

@@ -8,14 +8,17 @@ variables:
    DEBIAN_X86_TEST_BASE_IMAGE: "debian/x86_test-base"
 
    DEBIAN_X86_TEST_IMAGE_PATH: "debian/x86_test-gl"
-   DEBIAN_X86_TEST_GL_TAG: "2022-06-01-piglit-update"
-   DEBIAN_X86_TEST_VK_TAG: "2022-06-01-piglit-update"
+   DEBIAN_X86_TEST_GL_TAG: "2022-06-09-piglit-update"
+   DEBIAN_X86_TEST_VK_TAG: "2022-06-14-hang-detection"
 
    FEDORA_X86_BUILD_TAG: "2022-04-24-spirv-tools-5"
-   KERNEL_ROOTFS_TAG: "2022-06-01-piglit-update"
+   KERNEL_ROOTFS_TAG: "2022-06-09-piglit-update"
+
+   WINDOWS_X64_VS_PATH: "windows/x64_vs"
+   WINDOWS_X64_VS_TAG: "2022-06-10-vs"
 
    WINDOWS_X64_BUILD_PATH: "windows/x64_build"
-   WINDOWS_X64_BUILD_TAG: "2022-27-05-server_2022"
+   WINDOWS_X64_BUILD_TAG: "2022-06-10-vs"
 
    WINDOWS_X64_TEST_PATH: "windows/x64_test"
-   WINDOWS_X64_TEST_TAG: "2022-07-06-server_2022"
+   WINDOWS_X64_TEST_TAG: "2022-06-10-vs"

.gitlab-ci/lava/lava_job_submitter.py

@@ -375,10 +375,12 @@ def fix_lava_color_log(line):
     """This function is a temporary solution for the color escape codes mangling
     problem. There is some problem in message passing between the LAVA
     dispatcher and the device under test (DUT). Here \x1b character is missing
-    before `[:digit::digit:?m` ANSI TTY color codes. When this problem is fixed
-    on the LAVA side, one should remove this function.
+    before `[:digit::digit:?:digit:?m` ANSI TTY color codes, or the more
+    complicated ones with number values for text format before background and
+    foreground colors.
+    When this problem is fixed on the LAVA side, one should remove this function.
     """
-    line["msg"] = re.sub(r"(\[\d{1,2}m)", "\x1b" + r"\1", line["msg"])
+    line["msg"] = re.sub(r"(\[(\d+;){0,2}\d{1,3}m)", "\x1b" + r"\1", line["msg"])
 
 
 def fix_lava_gitlab_section_log(line):

.gitlab-ci/test/gitlab-ci.yml

@@ -185,8 +185,6 @@
   # depend on more than one image per job. So, the job container is
   # built as part of the CI in the boot2container project.
   image: registry.freedesktop.org/mupuf/valve-infra/mesa-trigger:2022-03-03.2
-  extends:
-    - .use-debian/x86_test-vk
   timeout: 1h 40m
   variables:
     # No need by default to pull the whole repo
@@ -214,7 +212,8 @@
     # we rename the MESA_IMAGE variable into IMAGE_UNDER_TEST.
     IMAGE_UNDER_TEST: "$MESA_IMAGE"
 
-    INSTALL_TARBALL: "./artifacts/install.tar"
+    INSTALL_TARBALL_NAME: "install.tar"
+    INSTALL_TARBALL: "./artifacts/${INSTALL_TARBALL_NAME}"
     CI_VALVE_ARTIFACTS: "./artifacts/valve"
     CI_COMMON_SCRIPTS: "./artifacts/ci-common"
     GENERATE_ENV_SCRIPT: "${CI_COMMON_SCRIPTS}/generate-env.sh"
@@ -246,7 +245,7 @@
       [ -d "$CI_COMMON_SCRIPTS" ] || exit 1
 
 
-      B2C_TEST_SCRIPT="bash -c 'source ./set-job-env-vars.sh ; ${B2C_TEST_SCRIPT}'"
+      B2C_TEST_SCRIPT="bash -c 'source ./set-job-env-vars.sh; tar xf ${INSTALL_TARBALL_NAME}; ${B2C_TEST_SCRIPT}'"
 
       # The Valve CI gateway receives jobs in a YAML format. Create a
       # job description from the CI environment.
@@ -289,9 +288,8 @@
       echo "export CI_JOB_JWT=${CI_JOB_JWT}" >> ${JOB_FOLDER}/set-job-env-vars.sh
       set -x
 
-      # Extract the Mesa distribution into the location expected by
-      # the Mesa CI deqp-runner scripts.
-      tar x -C ${JOB_FOLDER} -f $INSTALL_TARBALL
+      # Copy the mesa install tarball to the job folder, for later extraction
+      mv "${INSTALL_TARBALL}" "${JOB_FOLDER}"
 
   script: |
       slugify () {
@@ -308,9 +306,6 @@
       # Gitlab coordinator for status presentation. results/junit.xml
       # will be parsed by the UI for more detailed explanations of
       # test execution.
-  needs:
-    - debian/x86_test-vk
-    - debian-testing
   artifacts:
     when: always
     name: "mesa_${CI_JOB_NAME}"
@@ -318,3 +313,19 @@
       - ${JOB_FOLDER}/results
     reports:
       junit: ${JOB_FOLDER}/results/junit.xml
+
+.b2c-test-vk:
+  extends:
+    - .use-debian/x86_test-vk
+    - .b2c-test
+  needs:
+    - debian/x86_test-vk
+    - debian-testing
+
+.b2c-test-gl:
+  extends:
+    - .use-debian/x86_test-gl
+    - .b2c-test
+  needs:
+    - debian/x86_test-gl
+    - debian-testing

.gitlab-ci/tests/test_lava_job_submitter.py

@@ -364,6 +364,24 @@ COLOR_MANGLED_SCENARIOS = {
         ),
         "\x1b[0mPass: 26718, ExpectedFail: 95, Skip: 25187, Duration: 8:18, Remaining: 13",
     ),
+    "Mangled error message with bold formatting at target level": (
+        create_lava_yaml_msg(msg="[1;31mReview the image changes...", lvl="target"),
+        "\x1b[1;31mReview the image changes...",
+    ),
+    "Mangled error message with high intensity background at target level": (
+        create_lava_yaml_msg(msg="[100mReview the image changes...", lvl="target"),
+        "\x1b[100mReview the image changes...",
+    ),
+    "Mangled error message with underline+bg color+fg color at target level": (
+        create_lava_yaml_msg(msg="[4;41;97mReview the image changes...", lvl="target"),
+        "\x1b[4;41;97mReview the image changes...",
+    ),
+    "Bad input for color code.": (
+        create_lava_yaml_msg(
+            msg="[4;97 This message is missing the `m`.", lvl="target"
+        ),
+        "[4;97 This message is missing the `m`.",
+    ),
 }
 
 

.gitlab-ci/windows/Dockerfile_build

 # escape=`
 
-FROM mcr.microsoft.com/windows/server:ltsc2022
-
-# Make sure any failure in PowerShell scripts is fatal
-SHELL ["powershell", "-ExecutionPolicy", "RemoteSigned", "-Command", "$ErrorActionPreference = 'Stop';"]
-ENV ErrorActionPreference='Stop'
-
-COPY mesa_deps_vs2019.ps1 C:\
-RUN C:\mesa_deps_vs2019.ps1
+ARG base_image
+FROM ${base_image}
 
 COPY mesa_deps_build.ps1 C:\
 RUN C:\mesa_deps_build.ps1
+
+# When building, `--isolation=process` can leverage all cores and memory
+# docker build --isolation=process -f .\Dockerfile_build -t mesa_dep --build-arg base_image=mesa_vs .
+

.gitlab-ci/windows/Dockerfile_vs

+# escape=`
+
+ARG base_image
+FROM ${base_image}
+
+# https://www.thomasmaurer.ch/2019/07/how-to-install-and-update-powershell-7/
+# Wrapping the following command in cmd.exe
+# iex "& { $(irm https://aka.ms/install-powershell.ps1) } -UseMSI -Quiet"
+RUN powershell -ExecutionPolicy RemoteSigned -Command "$ErrorActionPreference = 'Stop'; iex ""& { $(irm https://aka.ms/install-powershell.ps1) } -UseMSI -Quiet"""
+
+# Make sure any failure in PowerShell scripts is fatal
+SHELL ["pwsh", "-ExecutionPolicy", "RemoteSigned", "-Command", "$ErrorActionPreference = 'Stop';"]
+RUN Write-Output $PSVersionTable $ErrorActionPreference
+
+COPY mesa_deps_vs2019.ps1 C:\
+RUN C:\mesa_deps_vs2019.ps1
+COPY mesa_vs_init.ps1 C:\
+
+ENV VULKAN_SDK_VERSION='1.3.211.0'
+COPY mesa_deps_choco.ps1 C:\
+RUN C:\mesa_deps_choco.ps1
+
+# Example usage:
+# `base_image` should use windows image that can be run with `--isolation=process` option,
+# since the resulting container will want to be used that way be later containers in the build process.
+# Only --isolation=hyperv can succeed building this container locally,
+#   --isolation=process have network issue when installing Visual Studio and choco will crash
+# docker build --isolation=hyperv -f .\Dockerfile_vs -t mesa_vs --build-arg base_image="mcr.microsoft.com/windows:10.0.19041.1415" .
+

.gitlab-ci/windows/README.md

@@ -30,3 +30,7 @@ host, without Docker.
 The Mesa build runs inside the base container, executing `mesa_build.ps1`.
 This simply compiles Mesa using Meson and Ninja, executing the build and
 unit tests. Currently, no build artifacts are captured.
+
+## Using build scripts locally
+
+`*.ps1` scripts for building dockers are using PowerShell 7 to run

.gitlab-ci/windows/deqp_runner_run.ps1

@@ -18,11 +18,12 @@ $deqp_module = "C:\deqp\external\vulkancts\modules\vulkan\deqp-vk.exe"
 $caselist = "C:\deqp\mustpass\vk-master.txt"
 $baseline = ".\_install\warp-fails.txt"
 $flakes = ".\_install\warp-flakes.txt"
-$includes = @("-t", "dEQP-VK.api.*", "-t", "dEQP-VK.binding_model.*", "-t", "dEQP-VK.info.*", "-t", "dEQP-VK.draw.*", "-t", "dEQP-VK.query_pool.*", "-t", "dEQP-VK.memory.*")
+$skips = ".\_install\warp-skips.txt"
+$includes = @("-t", "dEQP-VK.api.*", "-t", "dEQP-VK.binding_model.*", "-t", "dEQP-VK.info.*", "-t", "dEQP-VK.draw.*", "-t", "dEQP-VK.query_pool.*", "-t", "dEQP-VK.memory.*", "-t", "dEQP-VK.pipeline.vertex_input.*", "-t", "dEQP-VK.dynamic_state.*", "-t", "dEQP-VK.geometry.*")
 
 $env:DZN_DEBUG = "warp"
 $env:MESA_VK_IGNORE_CONFORMANCE_WARNING = "true"
-deqp-runner run --deqp $($deqp_module) --output $($results) --caselist $($caselist) --baseline $($baseline) --flakes $($flakes) $($includes) --testlog-to-xml C:\deqp\executor\testlog-to-xml.exe --jobs 4 --fraction 3  -- $($deqp_options)
+deqp-runner run --deqp $($deqp_module) --output $($results) --caselist $($caselist) --baseline $($baseline) --flakes $($flakes) --skips $($skips) $($includes) --testlog-to-xml C:\deqp\executor\testlog-to-xml.exe --jobs 4 --fraction 3  -- $($deqp_options)
 $deqpstatus = $?
 
 $template = "See https://$($env:CI_PROJECT_ROOT_NAMESPACE).pages.freedesktop.org/-/$($env:CI_PROJECT_NAME)/-/jobs/$($env:CI_JOB_ID)/artifacts/results/{{testcase}}.xml"

.gitlab-ci/windows/mesa_build.ps1

@@ -22,36 +22,46 @@ Remove-Item -Recurse -Force $installdir
 New-Item -ItemType Directory -Path $builddir
 New-Item -ItemType Directory -Path $installdir
 
+Write-Output "*" > $builddir\.gitignore
+Write-Output "*" > $installdir\.gitignore
+
 Write-Output builddir:$builddir
 Write-Output installdir:$installdir
 Write-Output sourcedir:$sourcedir
 
-$installPath=& "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" -version 16.0  -property installationpath
-Write-Output "vswhere.exe installPath: $installPath"
-$installPath="C:\BuildTools"
-Write-Output "Final installPath: $installPath"
-Import-Module (Join-Path $installPath "Common7\Tools\Microsoft.VisualStudio.DevShell.dll")
-Enter-VsDevShell -VsInstallPath $installPath -SkipAutomaticLocation -DevCmdArguments '-arch=x64 -no_logo -host_arch=amd64'
+$MyPath = $MyInvocation.MyCommand.Path | Split-Path -Parent
+. "$MyPath\mesa_vs_init.ps1"
+
+$depsInstallPath="C:\mesa-deps"
 
 Push-Location $builddir
 
-meson --default-library=shared -Dzlib:default_library=static --buildtype=release -Db_ndebug=false `
--Db_vscrt=mt --cmake-prefix-path="C:\llvm-10" `
---pkg-config-path="C:\llvm-10\lib\pkgconfig;C:\llvm-10\share\pkgconfig;C:\spirv-tools\lib\pkgconfig" `
+meson `
+--default-library=shared `
+-Dzlib:default_library=static `
+--buildtype=release `
+-Db_ndebug=false `
+-Db_vscrt=mt `
+--cmake-prefix-path="$depsInstallPath" `
+--pkg-config-path="$depsInstallPath\lib\pkgconfig;$depsInstallPath\share\pkgconfig" `
 --prefix="$installdir" `
--Dllvm=enabled -Dshared-llvm=disabled `
-"-Dvulkan-drivers=swrast,amd,microsoft-experimental" "-Dgallium-drivers=swrast,d3d12,zink" `
--Dshared-glapi=enabled -Dgles2=enabled -Dmicrosoft-clc=enabled -Dstatic-libclc=all -Dspirv-to-dxil=true `
--Dbuild-tests=true -Dwerror=true -Dwarning_level=2 -Dzlib:warning_level=1 -Dlibelf:warning_level=1 `
-$sourcedir
-
-if ($?) {
-  ninja install -j32
-}
-
-if ($?) {
-  meson test --num-processes 32
-}
+-Dllvm=enabled `
+-Dshared-llvm=disabled `
+-Dvulkan-drivers="swrast,amd,microsoft-experimental" `
+-Dgallium-drivers="swrast,d3d12,zink" `
+-Dshared-glapi=enabled `
+-Dgles2=enabled `
+-Dmicrosoft-clc=enabled `
+-Dstatic-libclc=all `
+-Dspirv-to-dxil=true `
+-Dbuild-tests=true `
+-Dwerror=true `
+-Dwarning_level=2 `
+-Dzlib:warning_level=1 `
+-Dlibelf:warning_level=1 `
+$sourcedir && `
+meson install --skip-subprojects && `
+meson test --num-processes 32
 
 $buildstatus = $?
 Pop-Location

.gitlab-ci/windows/mesa_deps_build.ps1

-# Download new TLS certs from Windows Update
-Get-Date
-Write-Host "Updating TLS certificate store"
-$certdir = (New-Item -ItemType Directory -Name "_tlscerts")
-certutil -syncwithWU "$certdir"
-Foreach ($file in (Get-ChildItem -Path "$certdir\*" -Include "*.crt")) {
-  Import-Certificate -FilePath $file -CertStoreLocation Cert:\LocalMachine\Root
-}
-Remove-Item -Recurse -Path $certdir
-
-
-Get-Date
-Write-Host "Installing Chocolatey"
-Invoke-Expression ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))
-Import-Module "$env:ProgramData\chocolatey\helpers\chocolateyProfile.psm1"
-Update-SessionEnvironment
-Write-Host "Installing Chocolatey packages"
-
-# Chocolatey tries to download winflexbison from SourceForge, which is not super reliable, and has no retry
-# loop of its own - so we give it a helping hand here
-For ($i = 0; $i -lt 5; $i++) {
-  choco install -y python3 --params="/InstallDir:C:\python3"
-  $python_install = $?
-  choco install --allow-empty-checksums --no-progress -y cmake git git-lfs ninja pkgconfiglite winflexbison --installargs "ADD_CMAKE_TO_PATH=System"
-  $other_install = $?
-  $choco_installed = $other_install -and $python_install
-  if ($choco_installed) {
-    Break
-  }
-}
-
-if (!$choco_installed) {
-  Write-Host "Couldn't install dependencies from Chocolatey"
-  Exit 1
-}
-
-# Add Chocolatey's native install path
-Update-SessionEnvironment
-# Python and CMake add themselves to the system environment path, which doesn't get refreshed
-# until we start a new shell
-$env:PATH = "C:\python3;C:\python3\scripts;C:\Program Files\CMake\bin;$env:PATH"
-
-Invoke-WebRequest -Uri 'https://sdk.lunarg.com/sdk/download/latest/windows/vulkan_sdk.exe' -OutFile 'C:\vulkan_sdk.exe'
-C:\vulkan_sdk.exe --am --al -c in
-if (!$?) {
-    Write-Host "Failed to install Vulkan SDK"
-    Exit 1
-}
-Remove-Item C:\vulkan_sdk.exe -Force
-
-Start-Process -NoNewWindow -Wait git -ArgumentList 'config --global core.autocrlf false'
 
-Get-Date
-Write-Host "Installing Meson, Mako and numpy"
-pip3 install meson mako numpy
-if (!$?) {
-  Write-Host "Failed to install dependencies from pip"
-  Exit 1
-}
+$MyPath = $MyInvocation.MyCommand.Path | Split-Path -Parent
+. "$MyPath\mesa_vs_init.ps1"
 
 # we want more secure TLS 1.2 for most things, but it breaks SourceForge
 # downloads so must be done after Chocolatey use
 [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 -bor [Net.SecurityProtocolType]::Tls13;
 
+Remove-Item -Recurse -Force -ErrorAction SilentlyContinue "deps" | Out-Null
+
 Get-Date
 Write-Host "Cloning LLVM release/12.x"
-git clone -b release/12.x --depth=1 https://github.com/llvm/llvm-project llvm-project
+git clone -b release/12.x --depth=1 https://github.com/llvm/llvm-project deps/llvm-project
 if (!$?) {
   Write-Host "Failed to clone LLVM repository"
   Exit 1
@@ -75,21 +21,44 @@ if (!$?) {
 # a tag matching LLVM 12.0.0
 Get-Date
 Write-Host "Cloning SPIRV-LLVM-Translator"
-git clone https://github.com/KhronosGroup/SPIRV-LLVM-Translator llvm-project/llvm/projects/SPIRV-LLVM-Translator
+git clone https://github.com/KhronosGroup/SPIRV-LLVM-Translator deps/llvm-project/llvm/projects/SPIRV-LLVM-Translator
 if (!$?) {
   Write-Host "Failed to clone SPIRV-LLVM-Translator repository"
   Exit 1
 }
-Push-Location llvm-project/llvm/projects/SPIRV-LLVM-Translator
+Push-Location deps/llvm-project/llvm/projects/SPIRV-LLVM-Translator
 git checkout 5b641633b3bcc3251a52260eee11db13a79d7258
 Pop-Location
 
+$depsInstallPath="C:\mesa-deps"
+
 Get-Date
 # slightly convoluted syntax but avoids the CWD being under the PS filesystem meta-path
-$llvm_build = New-Item -ItemType Directory -Path ".\llvm-project" -Name "build"
+$llvm_build = New-Item -ItemType Directory -ErrorAction SilentlyContinue -Force -Path ".\deps\llvm-project" -Name "build"
 Push-Location -Path $llvm_build.FullName
 Write-Host "Compiling LLVM and Clang"
-cmd.exe /C 'C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=amd64 && cmake ../llvm -GNinja -DCMAKE_BUILD_TYPE=Release -DLLVM_USE_CRT_RELEASE=MT -DCMAKE_INSTALL_PREFIX="C:\llvm-10" -DLLVM_ENABLE_PROJECTS="clang;lld" -DLLVM_TARGETS_TO_BUILD=AMDGPU;X86 -DLLVM_OPTIMIZED_TABLEGEN=TRUE -DLLVM_ENABLE_ASSERTIONS=TRUE -DLLVM_INCLUDE_UTILS=OFF -DLLVM_INCLUDE_RUNTIMES=OFF -DLLVM_INCLUDE_TESTS=OFF -DLLVM_INCLUDE_EXAMPLES=OFF -DLLVM_INCLUDE_GO_TESTS=OFF -DLLVM_INCLUDE_BENCHMARKS=OFF -DLLVM_BUILD_LLVM_C_DYLIB=OFF -DLLVM_ENABLE_DIA_SDK=OFF -DCLANG_BUILD_TOOLS=ON -DLLVM_SPIRV_INCLUDE_TESTS=OFF -Wno-dev && ninja -j32 install'
+cmake ../llvm `
+-GNinja `
+-DCMAKE_BUILD_TYPE=Release `
+-DLLVM_USE_CRT_RELEASE=MT `
+-DCMAKE_PREFIX_PATH="$depsInstallPath" `
+-DCMAKE_INSTALL_PREFIX="$depsInstallPath" `
+-DLLVM_ENABLE_PROJECTS="clang;lld" `
+-DLLVM_TARGETS_TO_BUILD="AMDGPU;X86" `
+-DLLVM_OPTIMIZED_TABLEGEN=TRUE `
+-DLLVM_ENABLE_ASSERTIONS=TRUE `
+-DLLVM_INCLUDE_UTILS=OFF `
+-DLLVM_INCLUDE_RUNTIMES=OFF `
+-DLLVM_INCLUDE_TESTS=OFF `
+-DLLVM_INCLUDE_EXAMPLES=OFF `
+-DLLVM_INCLUDE_GO_TESTS=OFF `
+-DLLVM_INCLUDE_BENCHMARKS=OFF `
+-DLLVM_BUILD_LLVM_C_DYLIB=OFF `
+-DLLVM_ENABLE_DIA_SDK=OFF `
+-DCLANG_BUILD_TOOLS=ON `
+-DLLVM_SPIRV_INCLUDE_TESTS=OFF `
+-Wno-dev && `
+ninja -j32 install
 $buildstatus = $?
 Pop-Location
 if (!$buildstatus) {
@@ -98,55 +67,64 @@ if (!$buildstatus) {
 }
 
 Get-Date
-$libclc_build = New-Item -ItemType Directory -Path ".\llvm-project" -Name "build-libclc"
+$libclc_build = New-Item -ItemType Directory -Path ".\deps\llvm-project" -Name "build-libclc"
 Push-Location -Path $libclc_build.FullName
 Write-Host "Compiling libclc"
 # libclc can only be built with Ninja, because CMake's VS backend doesn't know how to compile new language types
-cmd.exe /C 'C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=amd64 && cmake ../libclc -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-m64" -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded -DCMAKE_INSTALL_PREFIX="C:\llvm-10" -DLIBCLC_TARGETS_TO_BUILD="spirv-mesa3d-;spirv64-mesa3d-" && ninja -j32 install'
+cmake ../libclc `
+-GNinja `
+-DCMAKE_BUILD_TYPE=Release `
+-DCMAKE_CXX_FLAGS="-m64" `
+-DCMAKE_POLICY_DEFAULT_CMP0091=NEW `
+-DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded `
+-DCMAKE_INSTALL_PREFIX="$depsInstallPath" `
+-DLIBCLC_TARGETS_TO_BUILD="spirv-mesa3d-;spirv64-mesa3d-" && `
+ninja -j32 install
 $buildstatus = $?
 Pop-Location
-Remove-Item -Recurse -Path $libclc_build
+Remove-Item -Recurse -Force -ErrorAction SilentlyContinue -Path $libclc_build
 if (!$buildstatus) {
   Write-Host "Failed to compile libclc"
   Exit 1
 }
-Remove-Item -Recurse -Path $llvm_build
+Remove-Item -Recurse -Force -ErrorAction SilentlyContinue -Path $llvm_build
 
 Get-Date
 Write-Host "Cloning SPIRV-Tools"
-git clone https://github.com/KhronosGroup/SPIRV-Tools
+git clone -b "sdk-$env:VULKAN_SDK_VERSION" --depth=1 https://github.com/KhronosGroup/SPIRV-Tools deps/SPIRV-Tools
 if (!$?) {
   Write-Host "Failed to clone SPIRV-Tools repository"
   Exit 1
 }
-git clone https://github.com/KhronosGroup/SPIRV-Headers SPIRV-Tools/external/SPIRV-Headers
+git clone -b "sdk-$env:VULKAN_SDK_VERSION" --depth=1 https://github.com/KhronosGroup/SPIRV-Headers deps/SPIRV-Tools/external/SPIRV-Headers
 if (!$?) {
   Write-Host "Failed to clone SPIRV-Headers repository"
   Exit 1
 }
 Write-Host "Building SPIRV-Tools"
-$spv_build = New-Item -ItemType Directory -Path ".\SPIRV-Tools" -Name "build"
+$spv_build = New-Item -ItemType Directory -Path ".\deps\SPIRV-Tools" -Name "build"
 Push-Location -Path $spv_build.FullName
 # SPIRV-Tools doesn't use multi-threaded MSVCRT, but we need it to
-cmd.exe /C 'C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=amd64 && cmake .. -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded -DCMAKE_INSTALL_PREFIX="C:\spirv-tools" && ninja -j32 install'
+cmake .. `
+-GNinja `
+-DCMAKE_BUILD_TYPE=Release `
+-DCMAKE_POLICY_DEFAULT_CMP0091=NEW `
+-DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded `
+-DCMAKE_INSTALL_PREFIX="$depsInstallPath" && `
+ninja -j32 install
 $buildstatus = $?
 Pop-Location
-Remove-Item -Recurse -Path $spv_build
+Remove-Item -Recurse -Force -ErrorAction SilentlyContinue -Path $spv_build
 if (!$buildstatus) {
   Write-Host "Failed to compile SPIRV-Tools"
   Exit 1
 }
 
-Get-Date
-Write-Host "Downloading Vulkan-Runtime"
-Invoke-WebRequest -Uri 'https://sdk.lunarg.com/sdk/download/latest/windows/vulkan-runtime.exe' -OutFile 'C:\vulkan-runtime.exe' | Out-Null
-Write-Host "Installing Vulkan-Runtime"
-Start-Process -NoNewWindow -Wait C:\vulkan-runtime.exe -ArgumentList '/S'
-if (!$?) {
-  Write-Host "Failed to install Vulkan-Runtime"
-  Exit 1
+function Remove-Symlinks {
+  Get-ChildItem -Force -ErrorAction SilentlyContinue @Args | Where-Object { if($_.Attributes -match "ReparsePoint"){$_.Delete()} }
 }
-Remove-Item C:\vulkan-runtime.exe -Force
+Remove-Symlinks -Path "deps" -Recurse
+Remove-Item -Recurse -Force -ErrorAction SilentlyContinue -Path "deps" | Out-Null
 
 Get-Date
 Write-Host "Complete"

.gitlab-ci/windows/mesa_deps_choco.ps1

+# Download new TLS certs from Windows Update
+Get-Date
+Write-Host "Updating TLS certificate store"
+Remove-Item -Recurse -Force -ErrorAction SilentlyContinue "_tlscerts" | Out-Null
+$certdir = (New-Item -ItemType Directory -Name "_tlscerts")
+certutil -syncwithWU "$certdir"
+Foreach ($file in (Get-ChildItem -Path "$certdir\*" -Include "*.crt")) {
+  Import-Certificate -FilePath $file -CertStoreLocation Cert:\LocalMachine\Root | Out-Null
+}
+Remove-Item -Recurse -Path $certdir
+
+
+Get-Date
+Write-Host "Installing Chocolatey"
+Invoke-Expression ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))
+Import-Module "$env:ProgramData\chocolatey\helpers\chocolateyProfile.psm1"
+Update-SessionEnvironment
+Write-Host "Installing Chocolatey packages"
+
+# Chocolatey tries to download winflexbison from SourceForge, which is not super reliable, and has no retry
+# loop of its own - so we give it a helping hand here
+For ($i = 0; $i -lt 5; $i++) {
+  choco install --no-progress -y python3 --params="/InstallDir:C:\python3"
+  $python_install = $?
+  choco install --allow-empty-checksums --no-progress -y cmake git git-lfs ninja pkgconfiglite winflexbison --installargs "ADD_CMAKE_TO_PATH=System"
+  $other_install = $?
+  $choco_installed = $other_install -and $python_install
+  if ($choco_installed) {
+    Break
+  }
+}
+
+if (!$choco_installed) {
+  Write-Host "Couldn't install dependencies from Chocolatey"
+  Exit 1
+}
+
+# Add Chocolatey's native install path
+Update-SessionEnvironment
+# Python and CMake add themselves to the system environment path, which doesn't get refreshed
+# until we start a new shell
+$env:PATH = "C:\python3;C:\python3\scripts;C:\Program Files\CMake\bin;$env:PATH"
+
+Start-Process -NoNewWindow -Wait git -ArgumentList 'config --global core.autocrlf false'
+
+Get-Date
+Write-Host "Installing Meson, Mako and numpy"
+pip3 install meson mako numpy --progress-bar off
+if (!$?) {
+  Write-Host "Failed to install dependencies from pip"
+  Exit 1
+}
+
+Get-Date
+Write-Host "Downloading Vulkan-SDK"
+Invoke-WebRequest -Uri "https://sdk.lunarg.com/sdk/download/$env:VULKAN_SDK_VERSION/windows/VulkanSDK-$env:VULKAN_SDK_VERSION-Installer.exe" -OutFile 'C:\vulkan_sdk.exe'
+C:\vulkan_sdk.exe --am --al -c in
+if (!$?) {
+    Write-Host "Failed to install Vulkan SDK"
+    Exit 1
+}
+Remove-Item C:\vulkan_sdk.exe -Force
+
+Get-Date
+Write-Host "Downloading Vulkan-Runtime"
+Invoke-WebRequest -Uri "https://sdk.lunarg.com/sdk/download/$env:VULKAN_SDK_VERSION/windows/VulkanRT-$env:VULKAN_SDK_VERSION-Installer.exe" -OutFile 'C:\vulkan-runtime.exe' | Out-Null
+Write-Host "Installing Vulkan-Runtime"
+Start-Process -NoNewWindow -Wait C:\vulkan-runtime.exe -ArgumentList '/S'
+if (!$?) {
+  Write-Host "Failed to install Vulkan-Runtime"
+  Exit 1
+}
+Remove-Item C:\vulkan-runtime.exe -Force

.gitlab-ci/windows/mesa_deps_test.ps1

@@ -25,6 +25,9 @@ if (!$?) {
   Exit 1
 }
 
+$MyPath = $MyInvocation.MyCommand.Path | Split-Path -Parent
+. "$MyPath\mesa_vs_init.ps1"
+
 Get-Date
 Write-Host "Downloading glext.h"
 New-Item -ItemType Directory -Path ".\glext" -Name "GL"
@@ -46,7 +49,14 @@ Get-Date
 $piglit_build = New-Item -ItemType Directory -Path "C:\src\piglit" -Name "build"
 Push-Location -Path $piglit_build.FullName
 Write-Host "Compiling Piglit"
-cmd.exe /C 'C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=amd64 && cmake .. -GNinja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="C:\Piglit" -DGLUT_INCLUDE_DIR=C:\freeglut\include -DGLUT_glut_LIBRARY_RELEASE=C:\freeglut\lib\x64\freeglut.lib -DGLEXT_INCLUDE_DIR=.\glext && ninja -j32'
+cmake .. `
+-GNinja `
+-DCMAKE_BUILD_TYPE=Release `
+-DCMAKE_INSTALL_PREFIX="C:\Piglit" `
+-DGLUT_INCLUDE_DIR=C:\freeglut\include `
+-DGLUT_glut_LIBRARY_RELEASE=C:\freeglut\lib\x64\freeglut.lib `
+-DGLEXT_INCLUDE_DIR=.\glext && `
+ninja -j32
 $buildstatus = $?
 ninja -j32 install | Out-Null
 $installstatus = $?
@@ -86,7 +96,12 @@ Get-Date
 $deqp_build = New-Item -ItemType Directory -Path "C:\deqp"
 Push-Location -Path $deqp_build.FullName
 Write-Host "Compiling deqp"
-cmd.exe /C "C:\BuildTools\Common7\Tools\VsDevCmd.bat -host_arch=amd64 -arch=amd64 && cmake -S $($deqp_source) -B . -GNinja -DCMAKE_BUILD_TYPE=Release -DDEQP_TARGET=default && ninja -j32"
+cmake -S $($deqp_source) `
+-B . `
+-GNinja `
+-DCMAKE_BUILD_TYPE=Release `
+-DDEQP_TARGET=default && `
+ninja -j32
 $buildstatus = $?
 Pop-Location
 if (!$buildstatus -Or !$installstatus) {

.gitlab-ci/windows/mesa_deps_vs2019.ps1

@@ -10,9 +10,29 @@ Invoke-WebRequest -Uri $msvc_2019_url -OutFile C:\vs_buildtools.exe
 
 Get-Date
 Write-Host "Installing Visual Studio 2019"
-Start-Process -NoNewWindow -Wait C:\vs_buildtools.exe -ArgumentList '--wait --quiet --norestart --nocache --installPath C:\BuildTools --add Microsoft.VisualStudio.Workload.VCTools --add Microsoft.VisualStudio.Workload.NativeDesktop --add Microsoft.VisualStudio.Component.VC.ATL --add Microsoft.VisualStudio.Component.VC.ATLMFC --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 --add Microsoft.VisualStudio.Component.Graphics.Tools --add Microsoft.VisualStudio.Component.Windows10SDK.18362 --includeRecommended'
+# Command line
+# https://docs.microsoft.com/en-us/visualstudio/install/command-line-parameter-examples?view=vs-2019
+# Component ids
+# https://docs.microsoft.com/en-us/visualstudio/install/workload-component-id-vs-build-tools?view=vs-2019
+# https://docs.microsoft.com/en-us/visualstudio/install/workload-component-id-vs-community?view=vs-2019
+Start-Process -NoNewWindow -Wait -FilePath C:\vs_buildtools.exe `
+-ArgumentList `
+"--wait", `
+"--quiet", `
+"--norestart", `
+"--nocache", `
+"--installPath", "C:\BuildTools", `
+"--add", "Microsoft.VisualStudio.Component.VC.ASAN", `
+"--add", "Microsoft.VisualStudio.Component.VC.Redist.14.Latest", `
+"--add", "Microsoft.VisualStudio.Component.VC.ATL", `
+"--add", "Microsoft.VisualStudio.Component.VC.ATLMFC", `
+"--add", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", `
+"--add", "Microsoft.VisualStudio.Component.Graphics.Tools", `
+"--add", "Microsoft.VisualStudio.Component.Windows10SDK.19041"
+
 if (!$?) {
   Write-Host "Failed to install Visual Studio tools"
   Exit 1
 }
 Remove-Item C:\vs_buildtools.exe -Force
+Get-Date