Improve debug messenger, remove second Instance constructor

examples/src/bin/debug.rs

@@ -7,15 +7,14 @@
 // notice may not be copied, modified, or distributed except
 // according to those terms.
 
-use std::sync::Arc;
 use vulkano::{
     device::{
         physical::PhysicalDeviceType, Device, DeviceCreateInfo, DeviceExtensions, QueueCreateInfo,
     },
     instance::{
         debug::{
             DebugUtilsMessageSeverity, DebugUtilsMessageType, DebugUtilsMessenger,
-            DebugUtilsMessengerCreateInfo,
+            DebugUtilsMessengerCallback, DebugUtilsMessengerCreateInfo,
         },
         Instance, InstanceCreateFlags, InstanceCreateInfo, InstanceExtensions,
     },
@@ -86,37 +85,41 @@ fn main() {
                 message_type: DebugUtilsMessageType::GENERAL
                     | DebugUtilsMessageType::VALIDATION
                     | DebugUtilsMessageType::PERFORMANCE,
-                ..DebugUtilsMessengerCreateInfo::user_callback(Arc::new(|msg| {
-                    let severity = if msg.severity.intersects(DebugUtilsMessageSeverity::ERROR) {
-                        "error"
-                    } else if msg.severity.intersects(DebugUtilsMessageSeverity::WARNING) {
-                        "warning"
-                    } else if msg.severity.intersects(DebugUtilsMessageSeverity::INFO) {
-                        "information"
-                    } else if msg.severity.intersects(DebugUtilsMessageSeverity::VERBOSE) {
-                        "verbose"
-                    } else {
-                        panic!("no-impl");
-                    };
+                ..DebugUtilsMessengerCreateInfo::user_callback(DebugUtilsMessengerCallback::new(
+                    |message_severity, message_type, callback_data| {
+                        let severity = if message_severity
+                            .intersects(DebugUtilsMessageSeverity::ERROR)
+                        {
+                            "error"
+                        } else if message_severity.intersects(DebugUtilsMessageSeverity::WARNING) {
+                            "warning"
+                        } else if message_severity.intersects(DebugUtilsMessageSeverity::INFO) {
+                            "information"
+                        } else if message_severity.intersects(DebugUtilsMessageSeverity::VERBOSE) {
+                            "verbose"
+                        } else {
+                            panic!("no-impl");
+                        };
 
-                    let ty = if msg.ty.intersects(DebugUtilsMessageType::GENERAL) {
-                        "general"
-                    } else if msg.ty.intersects(DebugUtilsMessageType::VALIDATION) {
-                        "validation"
-                    } else if msg.ty.intersects(DebugUtilsMessageType::PERFORMANCE) {
-                        "performance"
-                    } else {
-                        panic!("no-impl");
-                    };
+                        let ty = if message_type.intersects(DebugUtilsMessageType::GENERAL) {
+                            "general"
+                        } else if message_type.intersects(DebugUtilsMessageType::VALIDATION) {
+                            "validation"
+                        } else if message_type.intersects(DebugUtilsMessageType::PERFORMANCE) {
+                            "performance"
+                        } else {
+                            panic!("no-impl");
+                        };
 
-                    println!(
-                        "{} {} {}: {}",
-                        msg.layer_prefix.unwrap_or("unknown"),
-                        ty,
-                        severity,
-                        msg.description
-                    );
-                }))
+                        println!(
+                            "{} {} {}: {}",
+                            callback_data.message_id_name.unwrap_or("unknown"),
+                            ty,
+                            severity,
+                            callback_data.message
+                        );
+                    },
+                ))
             },
         )
         .ok()

examples/src/bin/gl-interop.rs

@@ -34,7 +34,9 @@ mod linux {
             Image, ImageCreateFlags, ImageCreateInfo, ImageType, ImageUsage,
         },
         instance::{
-            debug::{DebugUtilsMessenger, DebugUtilsMessengerCreateInfo},
+            debug::{
+                DebugUtilsMessenger, DebugUtilsMessengerCallback, DebugUtilsMessengerCreateInfo,
+            },
             Instance, InstanceCreateFlags, InstanceCreateInfo, InstanceExtensions,
         },
         memory::{
@@ -487,15 +489,17 @@ mod linux {
         let _debug_callback = unsafe {
             DebugUtilsMessenger::new(
                 instance.clone(),
-                DebugUtilsMessengerCreateInfo::user_callback(Arc::new(|msg| {
-                    println!(
-                        "{} {:?} {:?}: {}",
-                        msg.layer_prefix.unwrap_or("unknown"),
-                        msg.ty,
-                        msg.severity,
-                        msg.description,
-                    );
-                })),
+                DebugUtilsMessengerCreateInfo::user_callback(DebugUtilsMessengerCallback::new(
+                    |message_severity, message_type, callback_data| {
+                        println!(
+                            "{} {:?} {:?}: {}",
+                            callback_data.message_id_name.unwrap_or("unknown"),
+                            message_type,
+                            message_severity,
+                            callback_data.message,
+                        );
+                    },
+                )),
             )
             .unwrap()
         };

vulkano-util/src/context.rs

@@ -147,14 +147,10 @@ impl VulkanoContext {
             Instance::new(library, config.instance_create_info).expect("failed to create instance");
 
         // Create debug callback
-        let _debug_utils_messenger =
-            config
-                .debug_create_info
-                .take()
-                .map(|dbg_create_info| unsafe {
-                    DebugUtilsMessenger::new(instance.clone(), dbg_create_info)
-                        .expect("failed to create debug callback")
-                });
+        let _debug_utils_messenger = config.debug_create_info.take().map(|dbg_create_info| {
+            DebugUtilsMessenger::new(instance.clone(), dbg_create_info)
+                .expect("failed to create debug callback")
+        });
 
         // Get prioritized device
         let physical_device = instance

vulkano/src/device/mod.rs

@@ -1675,6 +1675,23 @@ where
     }
 }
 
+/// Implemented on objects that implement both `DeviceOwned` and `VulkanObject`.
+pub unsafe trait DeviceOwnedVulkanObject {
+    /// Assigns a human-readable name to the object for debugging purposes.
+    ///
+    /// If `object_name` is `None`, a previously set object name is removed.
+    fn set_debug_utils_object_name(&self, object_name: Option<&str>) -> Result<(), OomError>;
+}
+
+unsafe impl<T> DeviceOwnedVulkanObject for T
+where
+    T: DeviceOwned + VulkanObject,
+{
+    fn set_debug_utils_object_name(&self, object_name: Option<&str>) -> Result<(), OomError> {
+        self.device().set_debug_utils_object_name(self, object_name)
+    }
+}
+
 /// Same as [`DebugWrapper`], but also prints the device handle for disambiguation.
 ///
 /// [`DebugWrapper`]: crate:: DebugWrapper