diff --git a/src/gl/inject.cpp b/src/gl/inject.cpp index b996c531..e3c4a470 100644 --- a/src/gl/inject.cpp +++ b/src/gl/inject.cpp @@ -54,6 +54,7 @@ void imgui_init() if (params.fps_limit > 0) fps_limit_stats.targetFrameTime = int64_t(1000000000.0 / params.fps_limit); cfg_inited = true; + init_cpu_stats(params); } void imgui_create(void *ctx) @@ -65,7 +66,6 @@ void imgui_create(void *ctx) if (!ctx) return; - cpuStats.Init(); imgui_init(); gl3wInit(); diff --git a/src/overlay.cpp b/src/overlay.cpp index f7ceafd2..971eda76 100644 --- a/src/overlay.cpp +++ b/src/overlay.cpp @@ -762,6 +762,15 @@ string exec(string command) { return result; } +void init_cpu_stats(overlay_params& params) +{ + auto& enabled = params.enabled; + enabled[OVERLAY_PARAM_ENABLED_cpu_stats] = cpuStats.Init() + && enabled[OVERLAY_PARAM_ENABLED_cpu_stats]; + enabled[OVERLAY_PARAM_ENABLED_cpu_temp] = cpuStats.GetCpuFile() + && enabled[OVERLAY_PARAM_ENABLED_cpu_temp]; +} + void init_gpu_stats(uint32_t& vendorID, overlay_params& params) { if (!params.enabled[OVERLAY_PARAM_ENABLED_gpu_stats]) @@ -2605,7 +2614,7 @@ static VkResult overlay_CreateInstance( if (instance_data->params.fps_limit > 0) fps_limit_stats.targetFrameTime = int64_t(1000000000.0 / instance_data->params.fps_limit); - cpuStats.Init(); + init_cpu_stats(instance_data->params); // Adjust height for DXVK/VKD3D version number if (engineName == "DXVK" || engineName == "VKD3D"){ diff --git a/src/overlay.h b/src/overlay.h index 9552f862..2cc93147 100644 --- a/src/overlay.h +++ b/src/overlay.h @@ -38,6 +38,7 @@ void position_layer(struct overlay_params& params, ImVec2 window_size, unsigned void render_imgui(swapchain_stats& data, struct overlay_params& params, ImVec2& window_size, unsigned width, unsigned height, bool is_vulkan); void update_hud_info(struct swapchain_stats& sw_stats, struct overlay_params& params, uint32_t vendorID); void init_gpu_stats(uint32_t& vendorID, overlay_params& params); +void init_cpu_stats(overlay_params& params); void check_keybinds(struct overlay_params& params); void init_system_info(void); void FpsLimiter(struct fps_limit& stats);