Skip to content

Commit bfc65a4

Browse files
committed
Merge branch 'main' into vmrcella/default-buffers-to-device-local
2 parents f9c7357 + e115036 commit bfc65a4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+5162
-113
lines changed

.github/workflows/compile_lambda_rs.yml

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,23 @@ jobs:
7272
if: ${{ matrix.os == 'ubuntu-latest' }}
7373
run: |
7474
echo "WGPU_BACKEND=vulkan" >> "$GITHUB_ENV"
75-
# Prefer Mesa's software Vulkan (lavapipe) to ensure headless availability
76-
echo "VK_ICD_FILENAMES=/usr/share/vulkan/icd.d/lvp_icd.x86_64.json" >> "$GITHUB_ENV"
75+
# Prefer Mesa's software Vulkan (lavapipe) to ensure headless availability.
76+
# The exact ICD filename can differ across Ubuntu images, so discover it.
77+
LVP_ICD="$(
78+
if [[ -d /usr/share/vulkan/icd.d ]]; then
79+
find /usr/share/vulkan/icd.d -maxdepth 1 -type f \
80+
\( -name '*lvp_icd*.json' -o -name '*lavapipe*.json' \) \
81+
-print 2>/dev/null | head -n1
82+
fi
83+
)"
84+
if [[ -z "$LVP_ICD" ]]; then
85+
echo "lavapipe Vulkan ICD not found under /usr/share/vulkan/icd.d" >&2
86+
ls -la /usr/share/vulkan/icd.d || true
87+
else
88+
echo "Using lavapipe ICD: $LVP_ICD"
89+
echo "VK_ICD_FILENAMES=$LVP_ICD" >> "$GITHUB_ENV"
90+
fi
91+
echo "LAMBDA_REQUIRE_GPU_ADAPTER=1" >> "$GITHUB_ENV"
7792
vulkaninfo --summary || true
7893
7994
# Windows runners already include the required toolchain for DX12 builds.

.github/workflows/coverage.yml

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ jobs:
2323
coverage:
2424
name: Generate code coverage with cargo-llvm-cov
2525
runs-on: ubuntu-latest
26+
env:
27+
LAMBDA_REQUIRE_GPU_ADAPTER: "1"
2628

2729
steps:
2830
- name: Checkout Repository
@@ -60,8 +62,22 @@ jobs:
6062
- name: Configure Vulkan (Ubuntu)
6163
run: |
6264
echo "WGPU_BACKEND=vulkan" >> "$GITHUB_ENV"
63-
# Prefer Mesa's software Vulkan (lavapipe) for headless availability
64-
echo "VK_ICD_FILENAMES=/usr/share/vulkan/icd.d/lvp_icd.x86_64.json" >> "$GITHUB_ENV"
65+
# Prefer Mesa's software Vulkan (lavapipe) for headless availability.
66+
# The exact ICD filename can differ across Ubuntu images, so discover it.
67+
LVP_ICD="$(
68+
if [[ -d /usr/share/vulkan/icd.d ]]; then
69+
find /usr/share/vulkan/icd.d -maxdepth 1 -type f \
70+
\( -name '*lvp_icd*.json' -o -name '*lavapipe*.json' \) \
71+
-print 2>/dev/null | head -n1
72+
fi
73+
)"
74+
if [[ -z "$LVP_ICD" ]]; then
75+
echo "lavapipe Vulkan ICD not found under /usr/share/vulkan/icd.d" >&2
76+
ls -la /usr/share/vulkan/icd.d || true
77+
else
78+
echo "Using lavapipe ICD: $LVP_ICD"
79+
echo "VK_ICD_FILENAMES=$LVP_ICD" >> "$GITHUB_ENV"
80+
fi
6581
vulkaninfo --summary || true
6682
6783
- name: Generate full coverage JSON

.github/workflows/release.yml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,23 @@ jobs:
5353
- name: Configure Vulkan for headless CI
5454
run: |
5555
echo "WGPU_BACKEND=vulkan" >> "$GITHUB_ENV"
56-
echo "VK_ICD_FILENAMES=/usr/share/vulkan/icd.d/lvp_icd.x86_64.json" >> "$GITHUB_ENV"
56+
# Prefer Mesa's software Vulkan (lavapipe) for headless availability.
57+
# The exact ICD filename can differ across Ubuntu images, so discover it.
58+
LVP_ICD="$(
59+
if [[ -d /usr/share/vulkan/icd.d ]]; then
60+
find /usr/share/vulkan/icd.d -maxdepth 1 -type f \
61+
\( -name '*lvp_icd*.json' -o -name '*lavapipe*.json' \) \
62+
-print 2>/dev/null | head -n1
63+
fi
64+
)"
65+
if [[ -z "$LVP_ICD" ]]; then
66+
echo "lavapipe Vulkan ICD not found under /usr/share/vulkan/icd.d" >&2
67+
ls -la /usr/share/vulkan/icd.d || true
68+
else
69+
echo "Using lavapipe ICD: $LVP_ICD"
70+
echo "VK_ICD_FILENAMES=$LVP_ICD" >> "$GITHUB_ENV"
71+
fi
72+
echo "LAMBDA_REQUIRE_GPU_ADAPTER=1" >> "$GITHUB_ENV"
5773
vulkaninfo --summary || true
5874
5975
- name: Format check

.gitignore

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,10 @@ Temporary Items
146146

147147
# End of https://www.gitignore.io/api/linux,cpp,c,cmake,macos,opengl
148148

149-
imgui.ini
149+
imgui.ini
150150

151-
# Planning
152-
docs/plans/
151+
# Planning
152+
docs/plans/
153+
154+
# Coverage reports
155+
coverage/

0 commit comments

Comments
 (0)