OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci/windows: Rev Vulkan SDK and piglit

Browse Source 
Reviewed-by: Sil Vilerino <sivileri@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27127>
This commit is contained in:
Jesse Natalie
2024-01-17 14:12:05 -08:00
committed by Marge Bot
parent b571ae6e7a
commit 13cc5afb35
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci/image-tags.yml
View File

@@ -34,7 +34,7 @@ variables:
WINDOWS_X64_MSVC_TAG: "2023-12-22-msvc" WINDOWS_X64_MSVC_TAG: "2023-12-22-msvc"
WINDOWS_X64_BUILD_PATH: "windows/x86_64_build" WINDOWS_X64_BUILD_PATH: "windows/x86_64_build"
WINDOWS_X64_BUILD_TAG: "2023-12-22-msvc" WINDOWS_X64_BUILD_TAG: "2024-01-17-vulkan-sdk"
WINDOWS_X64_TEST_PATH: "windows/x86_64_test" WINDOWS_X64_TEST_PATH: "windows/x86_64_test"
WINDOWS_X64_TEST_TAG: "2024-01-10-warp" WINDOWS_X64_TEST_TAG: "2024-01-17-vulkan-sdk"

4
.gitlab-ci/windows/mesa_deps_build.ps1
View File

@@ -158,12 +158,12 @@ Remove-Item -Recurse -Force -ErrorAction SilentlyContinue -Path $llvm_build
Get-Date Get-Date
Write-Host "Cloning SPIRV-Tools" Write-Host "Cloning SPIRV-Tools"
git clone -b "sdk-$env:VULKAN_SDK_VERSION" --depth=1 https://github.com/KhronosGroup/SPIRV-Tools deps/SPIRV-Tools git clone -b "vulkan-sdk-$env:VULKAN_SDK_VERSION" --depth=1 https://github.com/KhronosGroup/SPIRV-Tools deps/SPIRV-Tools
if (!$?) { if (!$?) {
Write-Host "Failed to clone SPIRV-Tools repository" Write-Host "Failed to clone SPIRV-Tools repository"
Exit 1 Exit 1
} }
git clone -b "sdk-$env:VULKAN_SDK_VERSION" --depth=1 https://github.com/KhronosGroup/SPIRV-Headers deps/SPIRV-Tools/external/SPIRV-Headers git clone -b "vulkan-sdk-$env:VULKAN_SDK_VERSION" --depth=1 https://github.com/KhronosGroup/SPIRV-Headers deps/SPIRV-Tools/external/SPIRV-Headers
if (!$?) { if (!$?) {
Write-Host "Failed to clone SPIRV-Headers repository" Write-Host "Failed to clone SPIRV-Headers repository"
Exit 1 Exit 1

2
.gitlab-ci/windows/mesa_deps_test_piglit.ps1
View File

@@ -53,7 +53,7 @@ New-Item -ItemType Directory -Path "$piglit_source" | Out-Null
Push-Location -Path $piglit_source Push-Location -Path $piglit_source
git init git init
git remote add origin https://gitlab.freedesktop.org/mesa/piglit.git git remote add origin https://gitlab.freedesktop.org/mesa/piglit.git
git fetch --depth 1 origin b41accc83689966f91217fc5b57dbe06202b8c8c # of branch main git fetch --depth 1 origin 814046fe6942eac660ee4a6cc5fcc54011a49945 # of branch main
if (!$?) { if (!$?) {
Write-Host "Failed to fetch Piglit repository" Write-Host "Failed to fetch Piglit repository"
Pop-Location Pop-Location

2
.gitlab-ci/windows/mesa_deps_vulkan_sdk.ps1
View File

@@ -2,7 +2,7 @@
# Touch this file needs update both WINDOWS_X64_BUILD_TAG WINDOWS_X64_TEST_TAG # Touch this file needs update both WINDOWS_X64_BUILD_TAG WINDOWS_X64_TEST_TAG
# This file needs run in administrator mode # This file needs run in administrator mode
$env:VULKAN_SDK_VERSION="1.3.211.0" $env:VULKAN_SDK_VERSION="1.3.275.0"
$ProgressPreference = "SilentlyContinue" $ProgressPreference = "SilentlyContinue"