Use Frame struct to represent FrameBegin and FrameEnd calls

Author: Meziu

citro3d/src/lib.rs

@@ -123,20 +123,9 @@ impl Instance {
         &'istance mut self,
         f: impl FnOnce(RenderPass<'frame>) -> RenderPass<'frame>,
     ) {
-        unsafe {
-            citro3d_sys::C3D_FrameBegin(
-                // TODO: begin + end flags should be configurable
-                citro3d_sys::C3D_FRAME_SYNCDRAW,
-            );
-        }
-
         let pass = f(RenderPass::new(self));
 
-        unsafe {
-            citro3d_sys::C3D_FrameEnd(0);
-        }
-
-        // Explicit drop after FrameEnd (when the GPU command buffer is flushed).
+        // Explicit drop for FrameEnd (when the GPU command buffer is flushed).
         drop(pass);
     }
 }

citro3d/src/render.rs

@@ -80,10 +80,13 @@ pub struct Target<'screen> {
     _queue: Rc<RenderQueue>,
 }
 
+struct Frame;
+
 #[non_exhaustive]
 #[must_use]
 pub struct RenderPass<'pass> {
     texenvs: [OnceCell<TexEnv>; texenv::TEXENV_COUNT],
+    _active_frame: Frame,
     _phantom: PhantomData<&'pass mut Instance>,
 }
 
@@ -99,6 +102,7 @@ impl<'pass> RenderPass<'pass> {
                 OnceCell::new(),
                 OnceCell::new(),
             ],
+            _active_frame: Frame::new(),
             _phantom: PhantomData,
         }
     }
@@ -334,6 +338,27 @@ impl<'screen> Target<'screen> {
     }
 }
 
+impl Frame {
+    fn new() -> Self {
+        unsafe {
+            citro3d_sys::C3D_FrameBegin(
+                // TODO: begin + end flags should be configurable
+                citro3d_sys::C3D_FRAME_SYNCDRAW,
+            )
+        };
+
+        Self {}
+    }
+}
+
+impl Drop for Frame {
+    fn drop(&mut self) {
+        unsafe {
+            citro3d_sys::C3D_FrameEnd(0);
+        }
+    }
+}
+
 impl Drop for Target<'_> {
     #[doc(alias = "C3D_RenderTargetDelete")]
     fn drop(&mut self) {