Fix macOS CI: Update Vulkan toolchain and migrate to winit 0.30/ash 0.38 APIs (#65)

* Initial plan

* Update macOS CI workflow with Vulkan SDK 1.4.304.0 and arm64-osx triplet

Co-authored-by: dontpanic92 <[email protected]>

* Improve Vulkan SDK installation with fallback method

Co-authored-by: dontpanic92 <[email protected]>

* Add sudo to Vulkan SDK installer and improve error handling

Co-authored-by: dontpanic92 <[email protected]>

* Add diagnostic output for Vulkan SDK extraction

Co-authored-by: dontpanic92 <[email protected]>

* Fix Vulkan SDK installation - use correct extracted directory name

Co-authored-by: dontpanic92 <[email protected]>

* Fix $HOME expansion and add VULKAN_SDK environment variables

Co-authored-by: dontpanic92 <[email protected]>

* Add Vulkan SDK PATH to Build step for glslc access

Co-authored-by: dontpanic92 <[email protected]>

* Centralize VULKAN_SDK_VERSION as workflow environment variable

Co-authored-by: dontpanic92 <[email protected]>

* Add diagnostic logging to debug glslc PATH issue

Co-authored-by: dontpanic92 <[email protected]>

* Install Vulkan SDK to default system location for PATH availability

Co-authored-by: dontpanic92 <[email protected]>

* Replace Vulkan SDK installer with Homebrew packages

Co-authored-by: dontpanic92 <[email protected]>

* Install shaderc instead of vulkan-tools to provide glslc

Co-authored-by: dontpanic92 <[email protected]>

* Fix winit API syntax errors for macOS/Android keyboard input

Co-authored-by: dontpanic92 <[email protected]>

* Fix ash API for macOS Vulkan extensions

Co-authored-by: dontpanic92 <[email protected]>

---------

Co-authored-by: copilot-swe-agent[bot] <[email protected]>
Co-authored-by: dontpanic92 <[email protected]>

Author: Copilot

.github/workflows/ci-macos.yml

@@ -12,6 +12,8 @@ env:
 jobs:
   macos-build:
     runs-on: macos-latest
+    env:
+      VCPKG_FEATURE_FLAGS: manifests
     steps:
       - uses: actions/checkout@v4
         with:
@@ -24,10 +26,9 @@ jobs:
       - name: Install Deps
         run: |
           brew install automake fdk-aac git lame libass libtool libvorbis libvpx opus sdl shtool texi2html theora wget x264 x265 xvid nasm
-          curl -O https://sdk.lunarg.com/sdk/download/1.2.198.1/mac/vulkansdk-macos-1.2.198.1.dmg
-          hdiutil attach vulkansdk-macos-1.2.198.1.dmg
-          cd /Volumes/vulkansdk-macos-1.2.198.1
-          sudo ./InstallVulkan.app/Contents/MacOS/InstallVulkan --root ~/VulkanSDK/1.2.176.1 --accept-licenses --default-answer --confirm-command install
+          # Install Vulkan tools via Homebrew
+          # shaderc provides glslc (shader compiler needed by build.rs)
+          brew install molten-vk vulkan-headers vulkan-loader shaderc
       - name: Cache ffmpeg
         uses: actions/cache@v3
         with:
@@ -36,7 +37,7 @@ jobs:
       - name: Install ffmpeg
         run: |
           vcpkg x-update-baseline
-          vcpkg install --triplet=x64-osx
+          vcpkg install --triplet=arm64-osx
           vcpkg integrate install
       - name: Build
         run: cargo build --workspace --release --verbose

radiance/radiance/src/input/keyboard/winit.rs

@@ -2,7 +2,7 @@ use crate::input::{Key, KeyState};
 #[cfg(any(target_os = "macos", target_os = "android"))]
 use winit::event::WindowEvent;
 use winit::{
-    event::{DeviceEvent, ElementState, Event, RawKeyEvent},
+    event::{DeviceEvent, ElementState, Event, KeyEvent, RawKeyEvent},
     keyboard::{KeyCode, PhysicalKey},
 };
 
@@ -46,19 +46,17 @@ impl KeyboardInput {
             Event::WindowEvent {
                 event:
                     WindowEvent::KeyboardInput {
-                        input:
-                            winit::event::KeyboardInput {
+                        event:
+                            winit::event::KeyEvent {
                                 state: ElementState::Pressed,
-                                virtual_keycode,
-                                scancode,
+                                physical_key: PhysicalKey::Code(code),
                                 ..
                             },
                         ..
                     },
                 ..
             } => {
                 keycode = Some(code);
-                scan_code = scancode;
                 action = Box::new(move |key| {
                     states[key as usize].set_down(true);
                     states[key as usize].set_pressed(true);
@@ -68,19 +66,17 @@ impl KeyboardInput {
             Event::WindowEvent {
                 event:
                     WindowEvent::KeyboardInput {
-                        input:
-                            winit::event::KeyboardInput {
+                        event:
+                            winit::event::KeyEvent {
                                 state: ElementState::Released,
-                                virtual_keycode,
-                                scancode,
+                                physical_key: PhysicalKey::Code(code),
                                 ..
                             },
                         ..
                     },
                 ..
             } => {
-                virtual_code = virtual_keycode;
-                scan_code = scancode;
+                keycode = Some(code);
                 action = Box::new(|key| {
                     states[key as usize].set_down(false);
                     states[key as usize].set_released(true);

radiance/radiance/src/rendering/vulkan/helpers.rs

@@ -9,8 +9,8 @@ pub fn instance_extension_names() -> Vec<*const c_char> {
         ash::khr::surface::NAME.as_ptr(),
         ash::ext::metal_surface::NAME.as_ptr(),
         ash::ext::debug_utils::NAME.as_ptr(),
-        ash::vk::KhrPortabilityEnumerationFn::name().as_ptr(),
-        ash::vk::KhrGetPhysicalDeviceProperties2Fn::name().as_ptr(),
+        ash::khr::portability_enumeration::NAME.as_ptr(),
+        ash::khr::get_physical_device_properties2::NAME.as_ptr(),
     ]
 }
 #[cfg(target_os = "linux")]