diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9ed23fb..eb07554 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,7 +17,7 @@ env: V3_COMMIT: f59b886d2564e37d8626d715236fdfa928e13dda V3_VC_COMMIT: 4598bc7e4894c154b27391e4442005fff2fbbd68 V3_TCC_COMMIT: d6e7ac1b1bcc98aed734a6ecbfa8509f24606c74 - VULKAN_REF: v2.0.0 + VULKAN_REF: v3.1.3 GLFW_COMMIT: 3d7c1ddacb7215a7bbeb5fef0d7a68c90ba392ed jobs: diff --git a/examples/vulkan_particles/live_sync.v b/examples/vulkan_particles/live_sync.v index de61483..42bdbce 100644 --- a/examples/vulkan_particles/live_sync.v +++ b/examples/vulkan_particles/live_sync.v @@ -31,8 +31,8 @@ fn create_live_interop_sync(compute &Compute, memory cl.ExternalMemoryInterop, return err } - mut vk_to_cl_fd := -1 - mut cl_to_vk_fd := -1 + mut vk_to_cl_fd := i32(-1) + mut cl_to_vk_fd := i32(-1) vk_wait_fd_info := vk.SemaphoreGetFdInfoKHR{ semaphore: vk_to_cl handleType: .opaque_fd diff --git a/examples/vulkan_particles/particle_buffer.v b/examples/vulkan_particles/particle_buffer.v index 256ec5f..f7f0fc6 100644 --- a/examples/vulkan_particles/particle_buffer.v +++ b/examples/vulkan_particles/particle_buffer.v @@ -92,7 +92,7 @@ fn create_zero_copy_particle_buffer(compute &Compute, memory_interop cl.External memory: memory handleType: .opaque_fd } - mut fd := -1 + mut fd := i32(-1) vk_check(vk.get_memory_fd_khr(device, &fd_info, &fd), 'export shared particle memory') or { vk.free_memory(device, memory, unsafe { nil }) vk.destroy_buffer(device, buffer, unsafe { nil }) diff --git a/examples/vulkan_particles/v.mod b/examples/vulkan_particles/v.mod index 81e337e..98a9991 100644 --- a/examples/vulkan_particles/v.mod +++ b/examples/vulkan_particles/v.mod @@ -3,5 +3,5 @@ Module { description: 'OpenCL particle simulation with a Vulkan renderer' version: '0.1.0' license: 'MIT' - dependencies: ['antono2.opencl@v1.0.0', 'antono2.vulkan@v2.0.0', 'antono2.glfw'] + dependencies: ['antono2.opencl@v1.0.0', 'antono2.vulkan@v3.1.3', 'antono2.glfw'] } diff --git a/examples/vulkan_particles/zero_copy_smoke.v b/examples/vulkan_particles/zero_copy_smoke.v index 8fd679a..f6f0bb1 100644 --- a/examples/vulkan_particles/zero_copy_smoke.v +++ b/examples/vulkan_particles/zero_copy_smoke.v @@ -80,7 +80,7 @@ fn zero_copy_memory_smoke(compute &Compute) ! { memory: memory handleType: .opaque_fd } - mut fd := -1 + mut fd := i32(-1) vk_check(vk.get_memory_fd_khr(device, &fd_info, &fd), 'export memory FD')! mut imported_buffer := memory_interop.import_opaque_fd_buffer[f32](compute.context, fd, int(compute.count * 8), cl.mem_read_write)! @@ -117,8 +117,8 @@ fn zero_copy_semaphore_smoke(compute &Compute, interop cl.ExternalSemaphoreInter vk_check(vk.create_semaphore(device, &semaphore_info, unsafe { nil }, &cl_to_vk), 'create OpenCL-to-Vulkan semaphore')! defer { vk.destroy_semaphore(device, cl_to_vk, unsafe { nil }) } - mut vk_to_cl_fd := -1 - mut cl_to_vk_fd := -1 + mut vk_to_cl_fd := i32(-1) + mut cl_to_vk_fd := i32(-1) vk_to_cl_fd_info := vk.SemaphoreGetFdInfoKHR{ semaphore: vk_to_cl handleType: .opaque_fd