From 42900dab4692fe284b2cbde6accb6d6e23465a41 Mon Sep 17 00:00:00 2001
From: hodasemi <michaelh.95@t-online.de>
Date: Thu, 30 Nov 2023 11:15:17 +0100
Subject: [PATCH] Remove hardcoded logging

---
 library_loader/src/macros.rs | 18 ------------------
 vulkan-rs/src/instance.rs    | 30 ------------------------------
 2 files changed, 48 deletions(-)

diff --git a/library_loader/src/macros.rs b/library_loader/src/macros.rs
index 309c059..f753e7a 100644
--- a/library_loader/src/macros.rs
+++ b/library_loader/src/macros.rs
@@ -14,30 +14,12 @@ macro_rules! load_function_ptrs {
             }
 
             impl $struct_name {
-                fn log(msg: impl ToString) {
-                    use std::io::Write;
-
-                    if let Ok(home) = std::env::var("HOME") {
-                        let log_file = format!("{}/rf2_vk_hud.log", home);
-
-                        if let Ok(mut file) = std::fs::OpenOptions::new()
-                            .append(true)
-                            .create(true)
-                            .open(&log_file)
-                        {
-                            if let Err(_) = file.write_all(format!("{}\n", msg.to_string()).as_bytes()) {}
-                        }
-                    }
-                }
-
                 pub fn load<F>(mut f: F) -> $struct_name
                     where F: FnMut(&std::ffi::CStr) -> *const std::os::raw::c_void
                 {
                     $struct_name {
                         $(
                             $name: unsafe {
-                                Self::log(format!("load: {}", stringify!($name)));
-
                                 let dummy: *const std::ffi::c_void = std::ptr::null();
 
                                 let name = std::ffi::CStr::from_bytes_with_nul_unchecked(concat!(stringify!($name), "\0").as_bytes());
diff --git a/vulkan-rs/src/instance.rs b/vulkan-rs/src/instance.rs
index 1f5d3be..4ed5226 100644
--- a/vulkan-rs/src/instance.rs
+++ b/vulkan-rs/src/instance.rs
@@ -98,22 +98,6 @@ impl Layer {
     }
 }
 
-fn log(msg: impl ToString) {
-    use std::io::Write;
-
-    let home = std::env::var("HOME").unwrap();
-
-    let log_file = format!("{}/rf2_vk_hud.log", home);
-
-    if let Ok(mut file) = std::fs::OpenOptions::new()
-        .append(true)
-        .create(true)
-        .open(&log_file)
-    {
-        if let Err(_) = file.write_all(format!("{}\n", msg.to_string()).as_bytes()) {}
-    }
-}
-
 impl Instance {
     pub fn preinitialized(
         instance: VkInstance,
@@ -121,37 +105,23 @@ impl Instance {
         extensions: &[VkString],
         api_version: Option<u32>,
     ) -> Result<Arc<Instance>> {
-        log("Instance::preinitialized: start");
-
         let static_functions = StaticFunctions {
             _lib: None,
             vkGetInstanceProcAddr: proc_addr,
         };
 
-        log("Instance::preinitialized: queried StaticFunctions");
-
         let instance_functions = InstanceFunctions::new(&static_functions, instance);
 
-        log("Instance::preinitialized: queried InstanceFunctions");
-
         let instance_wsi_functions = InstanceWSIFunctions::new(&static_functions, instance);
 
-        log("Instance::preinitialized: queried InstanceWSIFunctions");
-
         let physical_device_properties2_functions =
             PhysicalDeviceProperties2Functions::new(&static_functions, instance);
 
-        log("Instance::preinitialized: queried PhysicalDeviceProperties2Functions");
-
         let debug_report_callback_functions =
             DebugReportCallbackFunctions::new(&static_functions, instance);
 
-        log("Instance::preinitialized: queried DebugReportCallbackFunctions");
-
         let instance_extensions = InstanceExtensions::from_list(extensions);
 
-        log("Instance::preinitialized: queried InstanceExtensions");
-
         let instance = Arc::new(Instance {
             _static_functions: static_functions,
             _entry_functions: None,