From d20a92a0c4cb696894650b45348bf6c34d8a170d Mon Sep 17 00:00:00 2001
From: FlightlessMango <flightlessmangoyt@gmail.com>
Date: Wed, 5 Feb 2020 07:07:23 +0100
Subject: [PATCH] Write system info to log file

---
 src/logging.h   | 22 +++++++++++-----------
 src/overlay.cpp |  4 +++-
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/logging.h b/src/logging.h
index 35f66117..61718756 100644
--- a/src/logging.h
+++ b/src/logging.h
@@ -29,16 +29,15 @@ int duration, num;
 bool loggingOn;
 uint64_t log_start;
 
-void writeFile(string date){
-	out.open(mangohud_output_env + date, ios::out | ios::app);
-  out << "os," << "cpu," << "gpu," << "ram," << "kernel," << "driver" << endl;
-  out << os << "," << cpu << "," << gpu << "," << ram << "," << kernel << "," << driver << endl;
-	for (size_t i = 0; i < logArray.size(); i++) {
-     out << logArray[i].fps << "," << logArray[i].cpu  << "," << logArray[i].gpu << endl;
-  }
-	out.close();
-	logArray.clear();
-}
+// void writeFile(string date){
+// 	out.open(mangohud_output_env + date, ios::out | ios::app);
+
+// 	for (size_t i = 0; i < logArray.size(); i++) {
+//      out << logArray[i].fps << "," << logArray[i].cpu  << "," << logArray[i].gpu << endl;
+//   }
+// 	out.close();
+// 	logArray.clear();
+// }
 
 void *logging(void *){
   time_t now_log = time(0);
@@ -46,7 +45,8 @@ void *logging(void *){
 	string date = to_string(log_time->tm_year + 1900) + "-" + to_string(1 + log_time->tm_mon) + "-" + to_string(log_time->tm_mday) + "_" + to_string(1 + log_time->tm_hour) + "-" + to_string(1 + log_time->tm_min) + "-" + to_string(1 + log_time->tm_sec);
   log_start = os_time_get();
   out.open(mangohud_output_env + date, ios::out | ios::app);
-
+  out << "os," << "cpu," << "gpu," << "ram," << "kernel," << "driver" << endl;
+  out << os << "," << cpu << "," << gpu << "," << ram << "," << kernel << "," << driver << endl;
 	while (loggingOn){
     uint64_t now = os_time_get();
     elapsedLog = (double)(now - log_start);
diff --git a/src/overlay.cpp b/src/overlay.cpp
index bc5f9bc7..6c5d34f5 100644
--- a/src/overlay.cpp
+++ b/src/overlay.cpp
@@ -837,10 +837,12 @@ static void snapshot_swapchain_frame(struct swapchain_data *data)
       os = exec("cat /etc/*-release | grep 'PRETTY_NAME' | cut -d '=' -f 2-");
       os.erase(remove(os.begin(), os.end(), '\"' ), os.end());
       trim(os);
-      gpu = device_data->properties.deviceName;
+      gpu = exec("lspci | grep VGA | head -n1 | awk -vRS=']' -vFS='[' '{print $2}' | sed '/^$/d' | tail -n1");
+      trim(gpu);
       driver = exec("glxinfo | grep 'OpenGL version' | sed 's/^.*: //' | cut -d' ' --output-delimiter=$'\n' -f1- | grep -v '(' | grep -v ')' | tr '\n' ' ' | cut -c 1-");
       trim(driver);
       //driver = itox(device_data->properties.driverVersion);
+      cout << gpu << endl;
 
 #ifndef NDEBUG
       std::cout << "Ram:" << ram << "\n"