Skip to content

Commit a6f9559

Browse files
committed
More Github Actions Testing 7.
1 parent 9f33c12 commit a6f9559

1 file changed

Lines changed: 11 additions & 8 deletions

File tree

.github/workflows/ci.yml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,24 +76,27 @@ jobs:
7676
- name: Configure Environment (Windows)
7777
if: runner.os == 'Windows'
7878
run: |
79-
if (Test-Path "$env:VK_DRIVER_FILES") {
80-
echo "VK_DRIVER_FILES found at: $env:VK_DRIVER_FILES"
81-
echo "VK_ICD_FILENAMES=$env:VK_DRIVER_FILES" >> $env:GITHUB_ENV
79+
$swiftShaderDll = "C:\hostedtoolcache\windows\swiftshader\5.0.0.1\x64\vk_swiftshader.dll"
80+
$targetDll = "build\Debug\vulkan-1.dll"
81+
if (Test-Path $swiftShaderDll) {
82+
Copy-Item $swiftShaderDll $targetDll -Force
83+
echo "Copied SwiftShader to $targetDll to bypass elevated loader restrictions."
8284
} else {
83-
echo "::error::VK_DRIVER_FILES not found at: $env:VK_DRIVER_FILES"
85+
echo "::error::SwiftShader DLL not found at $swiftShaderDll"
8486
}
85-
# Set VK_LAYER_PATH to SDK Bin for validation layers
86-
echo "VK_LAYER_PATH=$env:VULKAN_SDK\Bin" >> $env:GITHUB_ENV
87-
# Enable Loader Debugging
88-
echo "VK_LOADER_DEBUG=all" >> $env:GITHUB_ENV
8987
9088
- name: Configure Environment (macOS)
9189
if: runner.os == 'macOS'
9290
run: |
9391
# Disable Metal Argument Buffers to prevent crash on Paravirt GPU
9492
echo "MVK_CONFIG_USE_METAL_ARGUMENT_BUFFERS=0" >> $GITHUB_ENV
93+
# Disable MTLHeap usage to prevent OOM on Paravirt GPU
94+
echo "MVK_CONFIG_USE_MTLHEAP=0" >> $GITHUB_ENV
9595
# Enable debug logging for MoltenVK
9696
echo "MVK_CONFIG_LOG_LEVEL=3" >> $GITHUB_ENV
97+
# Fix for Paravirt stability/OOM
98+
echo "MVK_CONFIG_SYNCHRONOUS_QUEUE_SUBMITS=1" >> $GITHUB_ENV
99+
echo "MVK_CONFIG_USE_COMMAND_POOLING=0" >> $GITHUB_ENV
97100
98101
# Check common locations for MoltenVK ICD
99102
if [ -f "$VULKAN_SDK/share/vulkan/icd.d/MoltenVK_icd.json" ]; then

0 commit comments

Comments
 (0)