Skip to content

Commit 4039138

Browse files
committed
CI/Release fixes
1 parent bcbc5f7 commit 4039138

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
os: windows-latest
2626
archive_name: vkrt-windows-x64
2727
meson_args: --buildtype=release -Db_vscrt=static_from_buildtype
28-
- name: Ubuntu
28+
- name: Ubuntu Linux
2929
os: ubuntu-22.04
3030
archive_name: vkrt-linux-x64
3131
meson_args: --buildtype=release -Dlinux_window_backend=both -Dnfd_backend=portal

.github/workflows/release.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ env:
1717

1818
jobs:
1919
build-windows:
20-
name: Windows Release
20+
name: Windows MSVC
2121
runs-on: windows-latest
2222

2323
steps:
@@ -83,28 +83,28 @@ jobs:
8383
run: ./build/vkrt.exe --help && ./build/vkrt.exe --version
8484
shell: bash
8585

86-
- name: Stage Release
86+
- name: Package Windows Artifact
8787
run: |
8888
python scripts/stage_release.py windows . --zip
8989
90-
- name: Test Packaged Windows Bundle
90+
- name: Test Windows Package
9191
run: ./vkrt-windows-x64/bin/vkrt.exe --help && ./vkrt-windows-x64/bin/vkrt.exe --version
9292
shell: bash
9393

94-
- name: Upload Release Asset
94+
- name: Upload Windows Release Asset
9595
if: github.ref_type == 'tag'
9696
uses: softprops/action-gh-release@v2.6.1
9797
with:
9898
files: vkrt-windows-x64.zip
9999

100-
- name: Upload Workflow Artifact
100+
- name: Upload Windows Artifact
101101
uses: actions/upload-artifact@v6
102102
with:
103103
name: vkrt-windows-x64
104104
path: vkrt-windows-x64.zip
105105

106106
build-linux:
107-
name: Linux Release
107+
name: Ubuntu Linux
108108
runs-on: ubuntu-22.04
109109

110110
steps:
@@ -156,7 +156,7 @@ jobs:
156156
- name: Install Linux Packages
157157
run: |
158158
sudo apt-get update
159-
sudo apt-get install -y libdbus-1-dev pkg-config libfuse2 desktop-file-utils libwayland-dev libxkbcommon-dev wayland-protocols libx11-dev libxrandr-dev libxinerama-dev libxi-dev libxcursor-dev libxext-dev
159+
sudo apt-get install -y libdbus-1-dev libturbojpeg0-dev pkg-config libfuse2 desktop-file-utils libwayland-dev libxkbcommon-dev wayland-protocols libx11-dev libxrandr-dev libxinerama-dev libxi-dev libxcursor-dev libxext-dev
160160
161161
- name: Install Meson and Ninja
162162
run: python -m pip install meson ninja
@@ -170,14 +170,14 @@ jobs:
170170
- name: Test
171171
run: ./build/vkrt --help && ./build/vkrt --version
172172

173-
- name: Package Linux Release
173+
- name: Package Linux Artifact
174174
env:
175175
APPIMAGETOOL_VERSION: ${{ env.APPIMAGETOOL_VERSION }}
176176
APPIMAGETOOL_SHA256: ${{ env.APPIMAGETOOL_SHA256 }}
177177
run: |
178178
python scripts/build_appimage.py . --appimage
179179
180-
- name: Test Packaged Linux Bundle
180+
- name: Test Linux Package
181181
run: ./vkrt-linux-x64/bin/vkrt --help && ./vkrt-linux-x64/bin/vkrt --version
182182

183183
- name: Test Linux Tarball
@@ -195,15 +195,15 @@ jobs:
195195
./vkrt-linux-x86_64.AppImage --appimage-extract-and-run --help
196196
./vkrt-linux-x86_64.AppImage --appimage-extract-and-run --version
197197
198-
- name: Upload Release Assets
198+
- name: Upload Linux Release Assets
199199
if: github.ref_type == 'tag'
200200
uses: softprops/action-gh-release@v2.6.1
201201
with:
202202
files: |
203203
vkrt-linux-x64.tar.gz
204204
vkrt-linux-x86_64.AppImage
205205
206-
- name: Upload Workflow Artifacts
206+
- name: Upload Linux Artifacts
207207
uses: actions/upload-artifact@v6
208208
with:
209209
name: vkrt-linux-x64

src/core/utility/export/image.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -416,14 +416,14 @@ static uint16_t floatToUnorm16(float value) {
416416
return (uint16_t)((value * 65535.0f) + 0.5f);
417417
}
418418

419-
static void clampPixelRGBNonNegative(float pixel[static 4]) {
419+
static void clampPixelRGBNonNegative(float pixel[4]) {
420420
if (!pixel) return;
421421
pixel[0] = fmaxf(pixel[0], 0.0f);
422422
pixel[1] = fmaxf(pixel[1], 0.0f);
423423
pixel[2] = fmaxf(pixel[2], 0.0f);
424424
}
425425

426-
static void normalizePixelRGB(float pixel[static 4]) {
426+
static void normalizePixelRGB(float pixel[4]) {
427427
if (!pixel) return;
428428

429429
float lengthSquared = (pixel[0] * pixel[0]) + (pixel[1] * pixel[1]) + (pixel[2] * pixel[2]);

0 commit comments

Comments
 (0)