Fix resource manager not popping debug group on error

Author: manpat

toybox-gfx/src/resource_manager.rs

@@ -198,6 +198,8 @@ impl ResourceManager {
 	pub fn process_requests(&mut self, core: &mut core::Core, vfs: &vfs::Vfs) -> anyhow::Result<()> {
 		core.push_debug_group("Process Resource Requests");
 
+		let _debug_group_guard = common::defer(|| core.pop_debug_group());
+
 		self.load_shader_requests.process_requests(&mut self.shaders, |def| {
 			let label = def.path.display().to_string();
 
@@ -225,10 +227,6 @@ impl ResourceManager {
 			Ok(ImageResource::from_create_request(core, def))
 		})?;
 
-		// TODO(pat.m): this will never be reached if the above fails, but if the above fails
-		// the whole engine is probably coming down anyway
-		core.pop_debug_group();
-
 		Ok(())
 	}
 }

toybox-gfx/src/resource_manager/image.rs

@@ -61,7 +61,7 @@ impl super::Resource for ImageResource {
 }
 
 impl ImageResource {
-	pub fn from_vfs(core: &mut Core, vfs: &vfs::Vfs, virtual_path: &Path, label: String) -> anyhow::Result<ImageResource> {
+	pub fn from_vfs(core: &Core, vfs: &vfs::Vfs, virtual_path: &Path, label: String) -> anyhow::Result<ImageResource> {
 		// TODO(pat.m): use a BufReader instead so that image can read only what it needs
 		let data = vfs.load_resource_data(virtual_path)?;
 
@@ -84,7 +84,7 @@ impl ImageResource {
 		})
 	}
 
-	pub fn array_from_vfs(core: &mut Core, vfs: &vfs::Vfs, virtual_paths: &[PathBuf], label: String) -> anyhow::Result<ImageResource> {
+	pub fn array_from_vfs(core: &Core, vfs: &vfs::Vfs, virtual_paths: &[PathBuf], label: String) -> anyhow::Result<ImageResource> {
 		if virtual_paths.is_empty() {
 			anyhow::bail!("Trying to create empty image array")
 		}
@@ -128,7 +128,7 @@ impl ImageResource {
 		})
 	}
 
-	pub fn from_create_request(core: &mut Core, req: &CreateImageRequest) -> ImageResource {
+	pub fn from_create_request(core: &Core, req: &CreateImageRequest) -> ImageResource {
 		let mut image_info = req.image_info.clone();
 
 		match req.resize_policy {
@@ -162,7 +162,7 @@ impl ImageResource {
 		}
 	}
 
-	pub(crate) fn on_resize(&mut self, core: &mut Core) {
+	pub(crate) fn on_resize(&mut self, core: &Core) {
 		let size_2d = match self.resize_policy {
 			ImageResizePolicy::Fixed => return,
 			ImageResizePolicy::MatchBackbuffer => core.backbuffer_size(),

toybox-gfx/src/resource_manager/shader.rs

@@ -36,7 +36,7 @@ impl super::Resource for ShaderResource {
 }
 
 impl ShaderResource {
-	pub fn from_source(core: &mut core::Core, shader_type: ShaderType, data: &str, label: &str) -> anyhow::Result<ShaderResource> {
+	pub fn from_source(core: &core::Core, shader_type: ShaderType, data: &str, label: &str) -> anyhow::Result<ShaderResource> {
 		// TODO(pat.m): ugh
 		let uses_user_clipping = data.contains("gl_ClipDistance");
 
@@ -76,7 +76,7 @@ impl ShaderResource {
 		})
 	}
 
-	pub fn from_vfs(core: &mut core::Core, vfs: &vfs::Vfs, shader_type: ShaderType, virtual_path: &Path, label: &str) -> anyhow::Result<ShaderResource> {
+	pub fn from_vfs(core: &core::Core, vfs: &vfs::Vfs, shader_type: ShaderType, virtual_path: &Path, label: &str) -> anyhow::Result<ShaderResource> {
 		let data = vfs.load_resource_data(virtual_path)?;
 		let data = String::from_utf8(data)?;
 
@@ -86,7 +86,7 @@ impl ShaderResource {
 
 
 // TODO(pat.m): Could this be in core?
-fn reflect_workgroup_size(core: &mut core::Core, shader_name: ShaderName) -> Option<Vec3i> {
+fn reflect_workgroup_size(core: &core::Core, shader_name: ShaderName) -> Option<Vec3i> {
 	if shader_name.shader_type != ShaderType::Compute {
 		return None
 	}