Changed vram to display GB from MB

pull/28/head
FlightlessMango 4 years ago
parent 3c4fcda623
commit 50cff923e8

@ -18,8 +18,9 @@
using namespace std;
int gpuLoad = 0, gpuTemp = 0, cpuTemp = 0, gpuMemUsed = 0, gpuMemTotal = 0;
int gpuLoad = 0, gpuTemp = 0, cpuTemp = 0;
FILE *amdGpuFile = nullptr, *amdTempFile = nullptr, *cpuTempFile = nullptr, *amdGpuVramTotalFile = nullptr, *amdGpuVramUsedFile = nullptr;
float gpuMemUsed = 0, gpuMemTotal = 0;
int numCpuCores = std::thread::hardware_concurrency();
pthread_t cpuThread, gpuThread, cpuInfoThread;
@ -75,7 +76,7 @@ void *getNvidiaGpuInfo(void *){
getNvidiaInfo();
gpuLoad = nvidiaUtilization.gpu;
gpuTemp = nvidiaTemp;
gpuMemUsed = nvidiaMemory.used / (1024 * 1024);
gpuMemUsed = float(nvidiaMemory.used / (1024 * 1024)) / 1000;
}
pthread_detach(gpuThread);
@ -115,7 +116,7 @@ void *getAmdGpuUsage(void *){
if (fscanf(amdGpuVramUsedFile, "%" PRId64, &amdgpu.memoryUsed) != 1)
amdgpu.memoryUsed = 0;
amdgpu.memoryUsed /= (1024 * 1024);
gpuMemUsed = amdgpu.memoryUsed;
gpuMemUsed = float(amdgpu.memoryUsed) / 1000;
}
pthread_detach(gpuThread);

@ -1171,16 +1171,16 @@ static void compute_swapchain_display(struct swapchain_data *data)
if (instance_data->params.enabled[OVERLAY_PARAM_ENABLED_vram]){
ImGui::TextColored(ImVec4(0.678, 0.392, 0.756, 1.00f), "VRAM");
ImGui::SameLine(hudFirstRow);
ImGui::Text("%i", gpuMemUsed);
ImGui::Text("%.2f", gpuMemUsed);
ImGui::SameLine(0,1.0f);
ImGui::PushFont(font1);
ImGui::Text("MB");
ImGui::Text("GB");
ImGui::PopFont();
}
if (instance_data->params.enabled[OVERLAY_PARAM_ENABLED_ram]){
ImGui::TextColored(ImVec4(0.760, 0.4, 0.576, 1.00f), "RAM");
ImGui::SameLine(hudFirstRow);
ImGui::Text("%.1f", memused);
ImGui::Text("%.2f", memused);
ImGui::SameLine(0,1.0f);
ImGui::PushFont(font1);
ImGui::Text("GB");

Loading…
Cancel
Save