GraphicsServer::begin_scope

fyrox-graphics-gl/src/server.rs

@@ -1428,7 +1428,7 @@ impl GraphicsServer for GlGraphicsServer {
         )?)))
     }
 
-    fn weak(self: Rc<Self>) -> Weak<dyn GraphicsServer> {
+    fn weak(&self) -> Weak<dyn GraphicsServer> {
         self.this.borrow().as_ref().unwrap().clone()
     }
 
@@ -1532,7 +1532,7 @@ impl GraphicsServer for GlGraphicsServer {
     }
 
     fn push_debug_group(&self, name: &str) {
-        if self.gl.supports_debug() {
+        if self.gl.supports_debug() && self.named_objects.get() {
             unsafe {
                 self.gl
                     .push_debug_group(glow::DEBUG_SOURCE_APPLICATION, 0, name)
@@ -1541,7 +1541,7 @@ impl GraphicsServer for GlGraphicsServer {
     }
 
     fn pop_debug_group(&self) {
-        if self.gl.supports_debug() {
+        if self.gl.supports_debug() && self.named_objects.get() {
             unsafe { self.gl.pop_debug_group() }
         }
     }

fyrox-graphics/src/server.rs

@@ -81,6 +81,18 @@ pub type SharedGraphicsServer = Rc<dyn GraphicsServer>;
 
 define_as_any_trait!(GraphicsServerAsAny => GraphicsServer);
 
+pub struct RenderingScope {
+    server: Weak<dyn GraphicsServer>,
+}
+
+impl Drop for RenderingScope {
+    fn drop(&mut self) {
+        if let Some(server) = self.server.upgrade() {
+            server.pop_debug_group();
+        }
+    }
+}
+
 /// Graphics server is an abstraction layer over various graphics APIs used on different platforms
 /// supported by the engine. Such abstraction layer tries to provide more or less high-level and
 /// unified interface, that can be used to build graphics pipelines quickly and more or less efficiently.
@@ -168,7 +180,7 @@ pub trait GraphicsServer: GraphicsServerAsAny {
     ) -> Result<GpuGeometryBuffer, FrameworkError>;
 
     /// Creates a weak reference to the shared graphics server.
-    fn weak(self: Rc<Self>) -> Weak<dyn GraphicsServer>;
+    fn weak(&self) -> Weak<dyn GraphicsServer>;
 
     /// Sends all scheduled GPU command buffers for execution on GPU without waiting for a certain
     /// threshold.
@@ -216,6 +228,14 @@ pub trait GraphicsServer: GraphicsServerAsAny {
     /// Ends the current debug group.
     fn pop_debug_group(&self);
 
+    fn begin_scope(&self, name: &str) -> RenderingScope {
+        self.push_debug_group(name);
+
+        RenderingScope {
+            server: self.weak(),
+        }
+    }
+
     /// A shortcut for [`Self::create_texture`], that creates a rectangular texture with the given
     /// size and pixel kind.
     fn create_2d_render_target(