File tree Expand file tree Collapse file tree 1 file changed +12
-13
lines changed Expand file tree Collapse file tree 1 file changed +12
-13
lines changed Original file line number Diff line number Diff line change @@ -169,17 +169,16 @@ unsafe extern "system" fn vulkan_debug_callback(
169
169
p_callback_data : * const vk:: DebugUtilsMessengerCallbackDataEXT < ' _ > ,
170
170
_user_data : * mut std:: os:: raw:: c_void ,
171
171
) -> vk:: Bool32 {
172
- let callback_data = unsafe { * p_callback_data } ;
173
- let message_id_name = if callback_data. p_message_id_name . is_null ( ) {
174
- Cow :: from ( "" )
175
- } else {
176
- unsafe { CStr :: from_ptr ( callback_data. p_message_id_name ) . to_string_lossy ( ) }
177
- } ;
178
- let message = if callback_data. p_message . is_null ( ) {
179
- Cow :: from ( "" )
180
- } else {
181
- unsafe { CStr :: from_ptr ( callback_data. p_message ) . to_string_lossy ( ) }
182
- } ;
183
- println ! ( "{message_severity:?}: [{message_id_name}] : {message}" ) ;
184
- vk:: FALSE
172
+ unsafe {
173
+ let callback_data = * p_callback_data;
174
+ let message_id_name = callback_data
175
+ . message_id_name_as_c_str ( )
176
+ . map_or ( Cow :: Borrowed ( "" ) , CStr :: to_string_lossy) ;
177
+ let message = callback_data
178
+ . message_as_c_str ( )
179
+ . map_or ( Cow :: Borrowed ( "" ) , CStr :: to_string_lossy) ;
180
+
181
+ println ! ( "{message_severity:?}: [{message_id_name}] : {message}" ) ;
182
+ vk:: FALSE
183
+ }
185
184
}
You can’t perform that action at this time.
0 commit comments