Move frame counter out of vulkan module

diff --git a/narcissus-gpu/src/backend/vulkan/mod.rs b/narcissus-gpu/src/backend/vulkan/mod.rs
index 66d94689b4191211ea7efcc8ba973a48612a5fe2..73ccf57d2e0514a17c8c619a466cfce1e842b21e 100644 (file)
--- a/narcissus-gpu/src/backend/vulkan/mod.rs
+++ b/narcissus-gpu/src/backend/vulkan/mod.rs
@@ -4,7 +4,7 @@ use std::{
     marker::PhantomData,
     os::raw::{c_char, c_void},
     ptr::NonNull,
-    sync::atomic::{AtomicU64, AtomicUsize, Ordering},
+    sync::atomic::{AtomicU64, Ordering},
 };
 
 use narcissus_core::{
@@ -17,15 +17,15 @@ use narcissus_core::{
 use vulkan_sys as vk;
 
 use crate::{
-    delay_queue::DelayQueue, Access, Bind, BindGroupLayout, BindGroupLayoutDesc, BindingType,
-    Buffer, BufferDesc, BufferImageCopy, BufferUsageFlags, ClearValue, CmdBuffer, CompareOp,
-    ComputePipelineDesc, CullingMode, Device, Extent2d, Extent3d, Frame, FrontFace, GlobalBarrier,
-    GpuConcurrent, GraphicsPipelineDesc, Image, ImageAspectFlags, ImageBarrier, ImageDesc,
-    ImageDimension, ImageFormat, ImageLayout, ImageSubresourceLayers, ImageSubresourceRange,
-    ImageUsageFlags, ImageViewDesc, IndexType, LoadOp, MemoryLocation, Offset2d, Offset3d,
-    Pipeline, PolygonMode, Sampler, SamplerAddressMode, SamplerCompareOp, SamplerDesc,
-    SamplerFilter, ShaderStageFlags, StencilOp, StencilOpState, StoreOp, SwapchainOutOfDateError,
-    ThreadToken, Topology, TypedBind,
+    delay_queue::DelayQueue, frame_counter::FrameCounter, Access, Bind, BindGroupLayout,
+    BindGroupLayoutDesc, BindingType, Buffer, BufferDesc, BufferImageCopy, BufferUsageFlags,
+    ClearValue, CmdBuffer, CompareOp, ComputePipelineDesc, CullingMode, Device, Extent2d, Extent3d,
+    Frame, FrontFace, GlobalBarrier, GpuConcurrent, GraphicsPipelineDesc, Image, ImageAspectFlags,
+    ImageBarrier, ImageDesc, ImageDimension, ImageFormat, ImageLayout, ImageSubresourceLayers,
+    ImageSubresourceRange, ImageUsageFlags, ImageViewDesc, IndexType, LoadOp, MemoryLocation,
+    Offset2d, Offset3d, Pipeline, PolygonMode, Sampler, SamplerAddressMode, SamplerCompareOp,
+    SamplerDesc, SamplerFilter, ShaderStageFlags, StencilOp, StencilOpState, StoreOp,
+    SwapchainOutOfDateError, ThreadToken, Topology, TypedBind,
 };
 
 const NUM_FRAMES: usize = 2;
@@ -781,61 +781,6 @@ struct VulkanCmdBufferPool {
     command_buffers: Vec<vk::CommandBuffer>,
 }
 
-impl<'device> Frame<'device> {
-    fn check_device(&self, device: &VulkanDevice) {
-        let device_address = device as *const _ as usize;
-        assert_eq!(self.device_addr, device_address, "frame device mismatch")
-    }
-
-    fn check_frame_counter(&self, frame_counter_value: usize) {
-        assert!(frame_counter_value & 1 == 0, "frame counter isn't acquired");
-        assert_eq!(
-            self.frame_index,
-            frame_counter_value >> 1,
-            "frame does not match device frame"
-        );
-    }
-}
-
-struct FrameCounter {
-    value: AtomicUsize,
-}
-
-impl FrameCounter {
-    fn new() -> Self {
-        Self {
-            // Start the frame id at 1 so that the first `begin_frame` ticks us over to a new frame index.
-            value: AtomicUsize::new(1),
-        }
-    }
-
-    fn load(&self) -> usize {
-        self.value.load(Ordering::Relaxed)
-    }
-
-    fn acquire(&self, device: &VulkanDevice) -> Frame {
-        let old_frame_counter = self.value.fetch_add(1, Ordering::SeqCst);
-        assert!(
-            old_frame_counter & 1 == 1,
-            "acquiring a frame before previous frame has been released"
-        );
-
-        let frame_counter = old_frame_counter + 1;
-        let frame_index = frame_counter >> 1;
-
-        Frame {
-            device_addr: device as *const _ as usize,
-            frame_index,
-            _phantom: &PhantomData,
-        }
-    }
-
-    fn release(&self, frame: Frame) {
-        let old_frame_counter = self.value.fetch_add(1, Ordering::SeqCst);
-        frame.check_frame_counter(old_frame_counter);
-    }
-}
-
 struct VulkanPerThread {
     cmd_buffer_pool: VulkanCmdBufferPool,
     descriptor_pool: vk::DescriptorPool,
@@ -1271,7 +1216,7 @@ impl VulkanDevice {
     }
 
     fn frame<'token>(&self, frame: &'token Frame) -> &'token VulkanFrame {
-        frame.check_device(self);
+        frame.check_device(self as *const _ as usize);
         frame.check_frame_counter(self.frame_counter.load());
         // Safety: Reference is bound to the frame exposed by the API. only one frame can be valid
         // at a time. The returned VulkanFrame is only valid so long as we have a ref on the frame.
@@ -1279,7 +1224,7 @@ impl VulkanDevice {
     }
 
     fn frame_mut<'token>(&self, frame: &'token mut Frame) -> &'token mut VulkanFrame {
-        frame.check_device(self);
+        frame.check_device(self as *const _ as usize);
         frame.check_frame_counter(self.frame_counter.load());
         // Safety: Reference is bound to the frame exposed by the API. only one frame can be valid
         // at a time. The returned VulkanFrame is only valid so long as we have a ref on the frame.
@@ -2710,7 +2655,7 @@ impl Device for VulkanDevice {
         let device_fn = &self.device_fn;
         let device = self.device;
 
-        let mut frame = self.frame_counter.acquire(self);
+        let mut frame = self.frame_counter.acquire(self as *const _ as usize);
         {
             let frame = self.frame_mut(&mut frame);
 

diff --git a/narcissus-gpu/src/frame_counter.rs b/narcissus-gpu/src/frame_counter.rs
new file mode 100644 (file)
index 0000000..a42dfec
--- /dev/null
+++ b/narcissus-gpu/src/frame_counter.rs
@@ -0,0 +1,45 @@
+use std::{
+    marker::PhantomData,
+    sync::atomic::{AtomicUsize, Ordering},
+};
+
+use crate::Frame;
+
+pub struct FrameCounter {
+    value: AtomicUsize,
+}
+
+impl FrameCounter {
+    pub fn new() -> Self {
+        Self {
+            // Start the frame id at 1 so that the first `begin_frame` ticks us over to a new frame index.
+            value: AtomicUsize::new(1),
+        }
+    }
+
+    pub fn load(&self) -> usize {
+        self.value.load(Ordering::Relaxed)
+    }
+
+    pub fn acquire(&self, device_addr: usize) -> Frame {
+        let old_frame_counter = self.value.fetch_add(1, Ordering::SeqCst);
+        assert!(
+            old_frame_counter & 1 == 1,
+            "acquiring a frame before previous frame has been released"
+        );
+
+        let frame_counter = old_frame_counter + 1;
+        let frame_index = frame_counter >> 1;
+
+        Frame {
+            device_addr,
+            frame_index,
+            _phantom: &PhantomData,
+        }
+    }
+
+    pub fn release(&self, frame: Frame) {
+        let old_frame_counter = self.value.fetch_add(1, Ordering::SeqCst);
+        frame.check_frame_counter(old_frame_counter);
+    }
+}

diff --git a/narcissus-gpu/src/lib.rs b/narcissus-gpu/src/lib.rs
index ecb86193b6a643122f2528955581999f7c6455b7..33430076b87cab2fb749571b2e639c0267e033a2 100644 (file)
--- a/narcissus-gpu/src/lib.rs
+++ b/narcissus-gpu/src/lib.rs
@@ -7,6 +7,7 @@ use narcissus_core::{
 
 mod backend;
 mod delay_queue;
+mod frame_counter;
 
 pub enum DeviceBackend {
     Vulkan,
@@ -600,6 +601,21 @@ pub struct Frame<'a> {
     _phantom: &'a PhantomData<()>,
 }
 
+impl<'a> Frame<'a> {
+    fn check_device(&self, device_addr: usize) {
+        assert_eq!(self.device_addr, device_addr, "frame device mismatch")
+    }
+
+    fn check_frame_counter(&self, frame_counter_value: usize) {
+        assert!(frame_counter_value & 1 == 0, "frame counter isn't acquired");
+        assert_eq!(
+            self.frame_index,
+            frame_counter_value >> 1,
+            "frame does not match device frame"
+        );
+    }
+}
+
 pub struct CmdBuffer<'a> {
     cmd_buffer_addr: usize,
     _phantom: &'a PhantomData<()>,