Skip to content

Commit c41eac7

Browse files
hoffstadthoffstadt-nasa
authored andcommitted
build: update deployment vulkan versions
1 parent 9df799d commit c41eac7

3 files changed

Lines changed: 8 additions & 12 deletions

File tree

.github/workflows/deploy.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
4747
- name: Install Dependencies
4848
run: |
49-
Invoke-WebRequest -Uri "https://sdk.lunarg.com/sdk/download/1.3.296.0/windows/VulkanSDK-1.3.296.0-Installer.exe" -OutFile VulkanSDK.exe
49+
Invoke-WebRequest -Uri "https://sdk.lunarg.com/sdk/download/1.4.350.0/windows/vulkansdk-windows-X64-1.4.350.0.exe" -OutFile VulkanSDK.exe
5050
# ./VulkanSDK.exe --help
5151
./VulkanSDK.exe --accept-licenses --default-answer --root D:/a/VulkanSDK --confirm-command install
5252
python -m pip install pl-build
@@ -156,7 +156,7 @@ jobs:
156156

157157
build-apple-wheels:
158158

159-
runs-on: macos-latest
159+
runs-on: macos-26
160160
env:
161161
CXX: g++-10
162162
strategy:
@@ -184,9 +184,9 @@ jobs:
184184
185185
- name: Install Dependencies
186186
run: |
187-
curl https://sdk.lunarg.com/sdk/download/1.3.283.0/mac/vulkansdk-macos-1.3.283.0.dmg -o vk.dmg
188-
hdiutil attach vk.dmg
189-
sudo /Volumes/vulkansdk-macos-1.3.283.0/InstallVulkan.app/Contents/MacOS/InstallVulkan --root ~/VulkanSDK/1.3.283.0 --accept-licenses --default-answer --confirm-command install com.lunarg.vulkan.core com.lunarg.vulkan.usr com.lunarg.vulkan.sdl2 com.lunarg.vulkan.glm com.lunarg.vulkan.volk com.lunarg.vulkan.vma com.lunarg.vulkan.ios
187+
curl https://sdk.lunarg.com/sdk/download/1.4.350.0/mac/vulkansdk-macos-1.4.350.0.zip -o vk.zip
188+
unzip vk.zip
189+
sudo ./vulkansdk-macOS-1.4.350.0.app/Contents/MacOS/vulkansdk-macOS-1.4.350.0 --root ~/VulkanSDK/1.4.350.0 --accept-licenses --default-answer --confirm-command install com.lunarg.vulkan.core com.lunarg.vulkan.usr com.lunarg.vulkan.sdl2 com.lunarg.vulkan.glm com.lunarg.vulkan.volk com.lunarg.vulkan.vma com.lunarg.vulkan.ios
190190
cd $GITHUB_WORKSPACE
191191
cd ..
192192
git clone https://github.com/PilotLightTech/pilotlight

extensions/pl_renderer_ext_m.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,15 @@ renderer_initialize(PyObject* self, PyObject* args, PyObject* kwargs)
2525
static const char* apcKeywords[] = {
2626
"ptDevice",
2727
"ptSwap",
28-
"uMaxTextureResolution",
2928
NULL,
3029
};
3130

32-
plRendererSettings tRenderSettings = {
33-
.uMaxTextureResolution = 1024
34-
};
31+
plRendererSettings tRenderSettings = {0};
3532

3633
PyObject* ptPyDevice = NULL;
3734
PyObject* ptPySwapchain = NULL;
38-
if (!pl_parse_args("OO|$I", (const char**)apcKeywords, args, kwargs, __FUNCTION__,
39-
&ptPyDevice, &ptPySwapchain, &tRenderSettings.uMaxTextureResolution))
35+
if (!pl_parse_args("OO", (const char**)apcKeywords, args, kwargs, __FUNCTION__,
36+
&ptPyDevice, &ptPySwapchain))
4037
return NULL;
4138

4239
tRenderSettings.ptDevice = PyCapsule_GetPointer(ptPyDevice, "plDevice");

pilotlight/types.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ class plFontConfig:
8080

8181
class plResourceManagerInit:
8282
ptDevice: plDevice
83-
uMaxTextureResolution: int = 1024
8483
pcCacheDirectory: str = "../cache"
8584

8685
@dataclass(slots=True)

0 commit comments

Comments
 (0)