From 4b3d3a50cd19501759dbf983c6fcc6cfe8d91950 Mon Sep 17 00:00:00 2001 From: Julian Orth Date: Wed, 18 Feb 2026 21:14:12 +0100 Subject: [PATCH] vulkan: move gpu-alloc-ash to core --- src/gfx_apis/vulkan.rs | 1 - src/gfx_apis/vulkan/allocator.rs | 8 ++------ src/vulkan_core.rs | 1 + src/{gfx_apis/vulkan => vulkan_core}/gpu_alloc_ash.rs | 0 4 files changed, 3 insertions(+), 7 deletions(-) rename src/{gfx_apis/vulkan => vulkan_core}/gpu_alloc_ash.rs (100%) diff --git a/src/gfx_apis/vulkan.rs b/src/gfx_apis/vulkan.rs index 78a1f396..47e1af43 100644 --- a/src/gfx_apis/vulkan.rs +++ b/src/gfx_apis/vulkan.rs @@ -10,7 +10,6 @@ mod device; mod dmabuf_buffer; mod eotfs; mod format; -mod gpu_alloc_ash; mod image; mod instance; mod pipeline; diff --git a/src/gfx_apis/vulkan/allocator.rs b/src/gfx_apis/vulkan/allocator.rs index 0b6d994c..c7fd5c1a 100644 --- a/src/gfx_apis/vulkan/allocator.rs +++ b/src/gfx_apis/vulkan/allocator.rs @@ -1,13 +1,9 @@ use { crate::{ cpu_worker::{AsyncCpuWork, CpuJob, CpuWork, CpuWorker}, - gfx_apis::vulkan::{ - VulkanError, - device::VulkanDevice, - gpu_alloc_ash::{self, AshMemoryDevice}, - renderer::VulkanRenderer, - }, + gfx_apis::vulkan::{VulkanError, device::VulkanDevice, renderer::VulkanRenderer}, utils::{numcell::NumCell, page_size::page_size, ptr_ext::MutPtrExt}, + vulkan_core::gpu_alloc_ash::{self, AshMemoryDevice}, }, ash::{ Device, diff --git a/src/vulkan_core.rs b/src/vulkan_core.rs index 397a5356..00dac433 100644 --- a/src/vulkan_core.rs +++ b/src/vulkan_core.rs @@ -32,6 +32,7 @@ use { pub mod device; pub mod fence; +pub mod gpu_alloc_ash; pub mod sync; pub mod timeline_semaphore; diff --git a/src/gfx_apis/vulkan/gpu_alloc_ash.rs b/src/vulkan_core/gpu_alloc_ash.rs similarity index 100% rename from src/gfx_apis/vulkan/gpu_alloc_ash.rs rename to src/vulkan_core/gpu_alloc_ash.rs