From 144e9a591768bd281a3c599c8847f3de0388a9d2 Mon Sep 17 00:00:00 2001 From: Alessandro Toia Date: Mon, 28 Sep 2020 17:44:45 -0700 Subject: [PATCH 01/16] Add color option to right_aligned_text --- src/vulkan.cpp | 41 +++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/src/vulkan.cpp b/src/vulkan.cpp index e5635635..54ee34b3 100644 --- a/src/vulkan.cpp +++ b/src/vulkan.cpp @@ -740,7 +740,7 @@ void position_layer(struct swapchain_stats& data, struct overlay_params& params, } } -static void right_aligned_text(float off_x, const char *fmt, ...) +static void right_aligned_text(ImVec4& col, float off_x, const char *fmt, ...) { ImVec2 pos = ImGui::GetCursorPos(); char buffer[32] {}; @@ -752,7 +752,8 @@ static void right_aligned_text(float off_x, const char *fmt, ...) ImVec2 sz = ImGui::CalcTextSize(buffer); ImGui::SetCursorPosX(pos.x + off_x - sz.x); - ImGui::Text("%s", buffer); + //ImGui::Text("%s", buffer); + ImGui::TextColored(col,"%s",buffer); } float get_ticker_limited_pos(float pos, float tw, float& left_limit, float& right_limit) @@ -934,7 +935,7 @@ void render_mango(swapchain_stats& data, struct overlay_params& params, ImVec2& gpu_text = params.gpu_text.c_str(); ImGui::TextColored(data.colors.gpu, "%s", gpu_text); ImGui::TableNextCell(); - right_aligned_text(ralign_width, "%i", gpu_info.load); + right_aligned_text(data.colors.text,ralign_width, "%i", gpu_info.load); ImGui::SameLine(0, 1.0f); ImGui::Text("%%"); } @@ -947,7 +948,7 @@ void render_mango(swapchain_stats& data, struct overlay_params& params, ImVec2& cpu_text = params.cpu_text.c_str(); ImGui::TextColored(data.colors.cpu, "%s", cpu_text); ImGui::TableNextCell(); - right_aligned_text(ralign_width, "%d", int(cpuStats.GetCPUDataTotal().percent)); + right_aligned_text(data.colors.text,ralign_width, "%d", int(cpuStats.GetCPUDataTotal().percent)); ImGui::SameLine(0, 1.0f); ImGui::Text("%%"); } @@ -955,7 +956,7 @@ void render_mango(swapchain_stats& data, struct overlay_params& params, ImVec2& ImGui::TableNextRow(); ImGui::TextColored(data.colors.engine, "%s", is_vulkan ? data.engineName.c_str() : "OpenGL"); ImGui::TableNextCell(); - right_aligned_text(ralign_width, "%.0f", data.fps); + right_aligned_text(data.colors.text,ralign_width, "%.0f", data.fps); ImGui::SameLine(0, 1.0f); ImGui::PushFont(data.font1); ImGui::Text("FPS"); @@ -1025,14 +1026,14 @@ void render_imgui(swapchain_stats& data, struct overlay_params& params, ImVec2& gpu_text = params.gpu_text.c_str(); ImGui::TextColored(data.colors.gpu, "%s", gpu_text); ImGui::TableNextCell(); - right_aligned_text(ralign_width, "%i", gpu_info.load); + right_aligned_text(data.colors.text,ralign_width, "%i", gpu_info.load); ImGui::SameLine(0, 1.0f); ImGui::Text("%%"); // ImGui::SameLine(150); // ImGui::Text("%s", "%"); if (params.enabled[OVERLAY_PARAM_ENABLED_gpu_temp]){ ImGui::TableNextCell(); - right_aligned_text(ralign_width, "%i", gpu_info.temp); + right_aligned_text(data.colors.text,ralign_width, "%i", gpu_info.temp); ImGui::SameLine(0, 1.0f); ImGui::Text("°C"); } @@ -1040,7 +1041,7 @@ void render_imgui(swapchain_stats& data, struct overlay_params& params, ImVec2& ImGui::TableNextRow(); if (params.enabled[OVERLAY_PARAM_ENABLED_gpu_core_clock]){ ImGui::TableNextCell(); - right_aligned_text(ralign_width, "%i", gpu_info.CoreClock); + right_aligned_text(data.colors.text,ralign_width, "%i", gpu_info.CoreClock); ImGui::SameLine(0, 1.0f); ImGui::PushFont(data.font1); ImGui::Text("MHz"); @@ -1048,7 +1049,7 @@ void render_imgui(swapchain_stats& data, struct overlay_params& params, ImVec2& } if (params.enabled[OVERLAY_PARAM_ENABLED_gpu_power]) { ImGui::TableNextCell(); - right_aligned_text(ralign_width, "%i", gpu_info.powerUsage); + right_aligned_text(data.colors.text,ralign_width, "%i", gpu_info.powerUsage); ImGui::SameLine(0, 1.0f); ImGui::PushFont(data.font1); ImGui::Text("W"); @@ -1064,7 +1065,7 @@ void render_imgui(swapchain_stats& data, struct overlay_params& params, ImVec2& cpu_text = params.cpu_text.c_str(); ImGui::TextColored(data.colors.cpu, "%s", cpu_text); ImGui::TableNextCell(); - right_aligned_text(ralign_width, "%d", int(cpuStats.GetCPUDataTotal().percent)); + right_aligned_text(data.colors.text,ralign_width, "%d", int(cpuStats.GetCPUDataTotal().percent)); ImGui::SameLine(0, 1.0f); ImGui::Text("%%"); // ImGui::SameLine(150); @@ -1072,7 +1073,7 @@ void render_imgui(swapchain_stats& data, struct overlay_params& params, ImVec2& if (params.enabled[OVERLAY_PARAM_ENABLED_cpu_temp]){ ImGui::TableNextCell(); - right_aligned_text(ralign_width, "%i", cpuStats.GetCPUDataTotal().temp); + right_aligned_text(data.colors.text,ralign_width, "%i", cpuStats.GetCPUDataTotal().temp); ImGui::SameLine(0, 1.0f); ImGui::Text("°C"); } @@ -1089,11 +1090,11 @@ void render_imgui(swapchain_stats& data, struct overlay_params& params, ImVec2& ImGui::TextColored(data.colors.cpu,"%i", i); ImGui::PopFont(); ImGui::TableNextCell(); - right_aligned_text(ralign_width, "%i", int(cpuData.percent)); + right_aligned_text(data.colors.text,ralign_width, "%i", int(cpuData.percent)); ImGui::SameLine(0, 1.0f); ImGui::Text("%%"); ImGui::TableNextCell(); - right_aligned_text(ralign_width, "%i", cpuData.mhz); + right_aligned_text(data.colors.text,ralign_width, "%i", cpuData.mhz); ImGui::SameLine(0, 1.0f); ImGui::PushFont(data.font1); ImGui::Text("MHz"); @@ -1114,7 +1115,7 @@ void render_imgui(swapchain_stats& data, struct overlay_params& params, ImVec2& if (params.enabled[OVERLAY_PARAM_ENABLED_io_read]){ ImGui::TableNextCell(); float val = data.io.diff.read * 1000000 / sampling; - right_aligned_text(ralign_width, val < 100 ? "%.1f" : "%.f", val); + right_aligned_text(data.colors.text,ralign_width, val < 100 ? "%.1f" : "%.f", val); ImGui::SameLine(0,1.0f); ImGui::PushFont(data.font1); ImGui::Text("MiB/s"); @@ -1123,7 +1124,7 @@ void render_imgui(swapchain_stats& data, struct overlay_params& params, ImVec2& if (params.enabled[OVERLAY_PARAM_ENABLED_io_write]){ ImGui::TableNextCell(); float val = data.io.diff.write * 1000000 / sampling; - right_aligned_text(ralign_width, val < 100 ? "%.1f" : "%.f", val); + right_aligned_text(data.colors.text,ralign_width, val < 100 ? "%.1f" : "%.f", val); ImGui::SameLine(0,1.0f); ImGui::PushFont(data.font1); ImGui::Text("MiB/s"); @@ -1134,14 +1135,14 @@ void render_imgui(swapchain_stats& data, struct overlay_params& params, ImVec2& ImGui::TableNextRow(); ImGui::TextColored(data.colors.vram, "VRAM"); ImGui::TableNextCell(); - right_aligned_text(ralign_width, "%.1f", gpu_info.memoryUsed); + right_aligned_text(data.colors.text,ralign_width, "%.1f", gpu_info.memoryUsed); ImGui::SameLine(0,1.0f); ImGui::PushFont(data.font1); ImGui::Text("GiB"); ImGui::PopFont(); if (params.enabled[OVERLAY_PARAM_ENABLED_gpu_mem_clock]){ ImGui::TableNextCell(); - right_aligned_text(ralign_width, "%i", gpu_info.MemClock); + right_aligned_text(data.colors.text,ralign_width, "%i", gpu_info.MemClock); ImGui::SameLine(0, 1.0f); ImGui::PushFont(data.font1); ImGui::Text("MHz"); @@ -1153,7 +1154,7 @@ void render_imgui(swapchain_stats& data, struct overlay_params& params, ImVec2& ImGui::TableNextRow(); ImGui::TextColored(data.colors.ram, "RAM"); ImGui::TableNextCell(); - right_aligned_text(ralign_width, "%.1f", memused); + right_aligned_text(data.colors.text,ralign_width, "%.1f", memused); ImGui::SameLine(0,1.0f); ImGui::PushFont(data.font1); ImGui::Text("GiB"); @@ -1164,13 +1165,13 @@ void render_imgui(swapchain_stats& data, struct overlay_params& params, ImVec2& ImGui::TableNextRow(); ImGui::TextColored(data.colors.engine, "%s", is_vulkan ? data.engineName.c_str() : "OpenGL"); ImGui::TableNextCell(); - right_aligned_text(ralign_width, "%.0f", data.fps); + right_aligned_text(data.colors.text,ralign_width, "%.0f", data.fps); ImGui::SameLine(0, 1.0f); ImGui::PushFont(data.font1); ImGui::Text("FPS"); ImGui::PopFont(); ImGui::TableNextCell(); - right_aligned_text(ralign_width, "%.1f", 1000 / data.fps); + right_aligned_text(data.colors.text,ralign_width, "%.1f", 1000 / data.fps); ImGui::SameLine(0, 1.0f); ImGui::PushFont(data.font1); ImGui::Text("ms"); From d7f04deb5648b35b1507dd3ebeaa2d7b627644f0 Mon Sep 17 00:00:00 2001 From: Alessandro Toia Date: Mon, 28 Sep 2020 21:24:26 -0700 Subject: [PATCH 02/16] Implement gpu load color change --- src/overlay.h | 5 ++++- src/overlay_params.cpp | 15 ++++++++++++++- src/overlay_params.h | 12 +++++++++++- src/vulkan.cpp | 28 +++++++++++++++++++++++++--- 4 files changed, 54 insertions(+), 6 deletions(-) diff --git a/src/overlay.h b/src/overlay.h index 471f36e1..023c9955 100644 --- a/src/overlay.h +++ b/src/overlay.h @@ -57,7 +57,10 @@ struct swapchain_stats { background, text, media_player, - wine; + wine, + gpu_load_high, + gpu_load_med, + gpu_load_low; } colors; }; diff --git a/src/overlay_params.cpp b/src/overlay_params.cpp index 1fe5346c..3a9702aa 100644 --- a/src/overlay_params.cpp +++ b/src/overlay_params.cpp @@ -324,6 +324,12 @@ parse_font_glyph_ranges(const char *str) #define parse_text_color(s) parse_color(s) #define parse_media_player_color(s) parse_color(s) #define parse_wine_color(s) parse_color(s) +#define parse_gpu_load_high_color(s) parse_color(s) +#define parse_gpu_load_med_color(s) parse_color(s) +#define parse_gpu_load_low_color(s) parse_color(s) +#define parse_gpu_load_high(s) parse_unsigned(s) +#define parse_gpu_load_med(s) parse_unsigned(s) +#define parse_gpu_load_low(s) parse_unsigned(s) static bool parse_help(const char *str) @@ -481,6 +487,9 @@ parse_overlay_config(struct overlay_params *params, params->media_player_name = ""; params->font_scale = 1.0f; params->wine_color = 0xeb5b5b; + params->gpu_load_high_color=0xb22222; + params->gpu_load_med_color=0xfdfd09; + params->gpu_load_low_color=0x39f900; params->font_scale_media_player = 0.55f; params->log_interval = 100; params->media_player_order = { MP_ORDER_TITLE, MP_ORDER_ARTIST, MP_ORDER_ALBUM }; @@ -562,7 +571,7 @@ parse_overlay_config(struct overlay_params *params, params->font_scale_media_player = 0.55f; // Convert from 0xRRGGBB to ImGui's format - std::array colors = { + std::array colors = { ¶ms->cpu_color, ¶ms->gpu_color, ¶ms->vram_color, @@ -574,6 +583,10 @@ parse_overlay_config(struct overlay_params *params, ¶ms->text_color, ¶ms->media_player_color, ¶ms->wine_color, + ¶ms->gpu_load_high_color, + ¶ms-> gpu_load_med_color, + ¶ms->gpu_load_low_color, + }; for (auto color : colors){ diff --git a/src/overlay_params.h b/src/overlay_params.h index 6eedbafe..d47b908f 100644 --- a/src/overlay_params.h +++ b/src/overlay_params.h @@ -50,6 +50,7 @@ typedef unsigned long KeySym; OVERLAY_PARAM_BOOL(engine_version) \ OVERLAY_PARAM_BOOL(histogram) \ OVERLAY_PARAM_BOOL(wine) \ + OVERLAY_PARAM_BOOL(gpu_load_change) \ OVERLAY_PARAM_CUSTOM(fps_sampling_period) \ OVERLAY_PARAM_CUSTOM(output_folder) \ OVERLAY_PARAM_CUSTOM(output_file) \ @@ -90,6 +91,9 @@ typedef unsigned long KeySym; OVERLAY_PARAM_CUSTOM(io_color) \ OVERLAY_PARAM_CUSTOM(text_color) \ OVERLAY_PARAM_CUSTOM (wine_color) \ + OVERLAY_PARAM_CUSTOM(gpu_load_high_color) \ + OVERLAY_PARAM_CUSTOM(gpu_load_med_color) \ + OVERLAY_PARAM_CUSTOM(gpu_load_low_color) \ OVERLAY_PARAM_CUSTOM(alpha) \ OVERLAY_PARAM_CUSTOM(log_duration) \ OVERLAY_PARAM_CUSTOM(pci_dev) \ @@ -102,7 +106,11 @@ typedef unsigned long KeySym; OVERLAY_PARAM_CUSTOM(permit_upload) \ OVERLAY_PARAM_CUSTOM(render_mango) \ OVERLAY_PARAM_CUSTOM(benchmark_percentiles) \ - OVERLAY_PARAM_CUSTOM(help) + OVERLAY_PARAM_CUSTOM(help) \ + OVERLAY_PARAM_CUSTOM(gpu_load_high) \ + OVERLAY_PARAM_CUSTOM(gpu_load_med) \ + OVERLAY_PARAM_CUSTOM(gpu_load_low) + enum overlay_param_position { LAYER_POSITION_TOP_LEFT, @@ -161,6 +169,8 @@ struct overlay_params { int gl_vsync; uint64_t log_duration; unsigned cpu_color, gpu_color, vram_color, ram_color, engine_color, io_color, frametime_color, background_color, text_color, wine_color; + unsigned gpu_load_high_color,gpu_load_med_color,gpu_load_low_color; + int gpu_load_high,gpu_load_med,gpu_load_low,gpu_load_change; unsigned media_player_color; unsigned tableCols; unsigned render_mango; diff --git a/src/vulkan.cpp b/src/vulkan.cpp index 54ee34b3..34bc5848 100644 --- a/src/vulkan.cpp +++ b/src/vulkan.cpp @@ -1026,9 +1026,28 @@ void render_imgui(swapchain_stats& data, struct overlay_params& params, ImVec2& gpu_text = params.gpu_text.c_str(); ImGui::TextColored(data.colors.gpu, "%s", gpu_text); ImGui::TableNextCell(); - right_aligned_text(data.colors.text,ralign_width, "%i", gpu_info.load); - ImGui::SameLine(0, 1.0f); - ImGui::Text("%%"); + if(params.enabled[OVERLAY_PARAM_ENABLED_gpu_load_change]){ + if(gpu_info.load >= params.gpu_load_high){ + right_aligned_text(data.colors.gpu_load_high,ralign_width, "%i", gpu_info.load); + ImGui::SameLine(0, 1.0f); + ImGui::TextColored(data.colors.gpu_load_high,"%%"); + } + else if (gpu_info.load >= params.gpu_load_med && gpu_info.load < params.gpu_load_high && gpu_info.load > params.gpu_load_low) { + right_aligned_text(data.colors.gpu_load_med,ralign_width, "%i", gpu_info.load); + ImGui::SameLine(0, 1.0f); + ImGui::TextColored(data.colors.gpu_load_med,"%%"); + } + else { + right_aligned_text(data.colors.gpu_load_low,ralign_width, "%i", gpu_info.load); + ImGui::SameLine(0, 1.0f); + ImGui::TextColored(data.colors.gpu_load_low,"%%"); + } + } + else { + right_aligned_text(data.colors.text,ralign_width, "%i", gpu_info.load); + ImGui::SameLine(0, 1.0f); + ImGui::Text("%%"); + } // ImGui::SameLine(150); // ImGui::Text("%s", "%"); if (params.enabled[OVERLAY_PARAM_ENABLED_gpu_temp]){ @@ -2096,6 +2115,9 @@ void convert_colors(bool do_conv, struct swapchain_stats& sw_stats, struct overl sw_stats.colors.text = convert(params.text_color); sw_stats.colors.media_player = convert(params.media_player_color); sw_stats.colors.wine = convert(params.wine_color); + sw_stats.colors.gpu_load_high = convert(params.gpu_load_high_color); + sw_stats.colors.gpu_load_med = convert(params.gpu_load_med_color); + sw_stats.colors.gpu_load_low = convert(params.gpu_load_low_color); ImGuiStyle& style = ImGui::GetStyle(); style.Colors[ImGuiCol_PlotLines] = convert(params.frametime_color); From 8605d2a7ddad1706514719ec3b9dd9e37c96ecbc Mon Sep 17 00:00:00 2001 From: Alessandro Toia Date: Tue, 29 Sep 2020 15:43:26 -0700 Subject: [PATCH 03/16] Add spaces --- src/vulkan.cpp | 58 +++++++++++++++++++++++++++----------------------- 1 file changed, 31 insertions(+), 27 deletions(-) diff --git a/src/vulkan.cpp b/src/vulkan.cpp index 34bc5848..8354abc9 100644 --- a/src/vulkan.cpp +++ b/src/vulkan.cpp @@ -935,7 +935,7 @@ void render_mango(swapchain_stats& data, struct overlay_params& params, ImVec2& gpu_text = params.gpu_text.c_str(); ImGui::TextColored(data.colors.gpu, "%s", gpu_text); ImGui::TableNextCell(); - right_aligned_text(data.colors.text,ralign_width, "%i", gpu_info.load); + right_aligned_text(data.colors.text, ralign_width, "%i", gpu_info.load); ImGui::SameLine(0, 1.0f); ImGui::Text("%%"); } @@ -948,7 +948,7 @@ void render_mango(swapchain_stats& data, struct overlay_params& params, ImVec2& cpu_text = params.cpu_text.c_str(); ImGui::TextColored(data.colors.cpu, "%s", cpu_text); ImGui::TableNextCell(); - right_aligned_text(data.colors.text,ralign_width, "%d", int(cpuStats.GetCPUDataTotal().percent)); + right_aligned_text(data.colors.text, ralign_width, "%d", int(cpuStats.GetCPUDataTotal().percent)); ImGui::SameLine(0, 1.0f); ImGui::Text("%%"); } @@ -956,7 +956,7 @@ void render_mango(swapchain_stats& data, struct overlay_params& params, ImVec2& ImGui::TableNextRow(); ImGui::TextColored(data.colors.engine, "%s", is_vulkan ? data.engineName.c_str() : "OpenGL"); ImGui::TableNextCell(); - right_aligned_text(data.colors.text,ralign_width, "%.0f", data.fps); + right_aligned_text(data.colors.text, ralign_width, "%.0f", data.fps); ImGui::SameLine(0, 1.0f); ImGui::PushFont(data.font1); ImGui::Text("FPS"); @@ -1026,25 +1026,29 @@ void render_imgui(swapchain_stats& data, struct overlay_params& params, ImVec2& gpu_text = params.gpu_text.c_str(); ImGui::TextColored(data.colors.gpu, "%s", gpu_text); ImGui::TableNextCell(); - if(params.enabled[OVERLAY_PARAM_ENABLED_gpu_load_change]){ - if(gpu_info.load >= params.gpu_load_high){ - right_aligned_text(data.colors.gpu_load_high,ralign_width, "%i", gpu_info.load); - ImGui::SameLine(0, 1.0f); - ImGui::TextColored(data.colors.gpu_load_high,"%%"); + auto gpu_high_color = data.colors.gpu_load_high; + auto gpu_med_color = data.colors.gpu_load_med; + auto gpu_low_color = data.colors.gpu_load_low; + auto text_color = data.colors.text; + if (params.enabled[OVERLAY_PARAM_ENABLED_gpu_load_change]){ + if (gpu_info.load >= params.gpu_load_high){ + right_aligned_text(gpu_high_color, ralign_width, "%i", gpu_info.load); + ImGui::SameLine(0, 1.0f); + ImGui::TextColored(gpu_high_color, "%%"); } else if (gpu_info.load >= params.gpu_load_med && gpu_info.load < params.gpu_load_high && gpu_info.load > params.gpu_load_low) { - right_aligned_text(data.colors.gpu_load_med,ralign_width, "%i", gpu_info.load); + right_aligned_text(gpu_med_color, ralign_width, "%i", gpu_info.load); ImGui::SameLine(0, 1.0f); - ImGui::TextColored(data.colors.gpu_load_med,"%%"); + ImGui::TextColored(gpu_med_color, "%%"); } else { - right_aligned_text(data.colors.gpu_load_low,ralign_width, "%i", gpu_info.load); + right_aligned_text(gpu_low_color, ralign_width, "%i", gpu_info.load); ImGui::SameLine(0, 1.0f); - ImGui::TextColored(data.colors.gpu_load_low,"%%"); + ImGui::TextColored(gpu_low_color, "%%"); } } else { - right_aligned_text(data.colors.text,ralign_width, "%i", gpu_info.load); + right_aligned_text(text_color, ralign_width, "%i", gpu_info.load); ImGui::SameLine(0, 1.0f); ImGui::Text("%%"); } @@ -1052,7 +1056,7 @@ void render_imgui(swapchain_stats& data, struct overlay_params& params, ImVec2& // ImGui::Text("%s", "%"); if (params.enabled[OVERLAY_PARAM_ENABLED_gpu_temp]){ ImGui::TableNextCell(); - right_aligned_text(data.colors.text,ralign_width, "%i", gpu_info.temp); + right_aligned_text(text_color, ralign_width, "%i", gpu_info.temp); ImGui::SameLine(0, 1.0f); ImGui::Text("°C"); } @@ -1060,7 +1064,7 @@ void render_imgui(swapchain_stats& data, struct overlay_params& params, ImVec2& ImGui::TableNextRow(); if (params.enabled[OVERLAY_PARAM_ENABLED_gpu_core_clock]){ ImGui::TableNextCell(); - right_aligned_text(data.colors.text,ralign_width, "%i", gpu_info.CoreClock); + right_aligned_text(text_color, ralign_width, "%i", gpu_info.CoreClock); ImGui::SameLine(0, 1.0f); ImGui::PushFont(data.font1); ImGui::Text("MHz"); @@ -1068,7 +1072,7 @@ void render_imgui(swapchain_stats& data, struct overlay_params& params, ImVec2& } if (params.enabled[OVERLAY_PARAM_ENABLED_gpu_power]) { ImGui::TableNextCell(); - right_aligned_text(data.colors.text,ralign_width, "%i", gpu_info.powerUsage); + right_aligned_text(text_color, ralign_width, "%i", gpu_info.powerUsage); ImGui::SameLine(0, 1.0f); ImGui::PushFont(data.font1); ImGui::Text("W"); @@ -1084,7 +1088,7 @@ void render_imgui(swapchain_stats& data, struct overlay_params& params, ImVec2& cpu_text = params.cpu_text.c_str(); ImGui::TextColored(data.colors.cpu, "%s", cpu_text); ImGui::TableNextCell(); - right_aligned_text(data.colors.text,ralign_width, "%d", int(cpuStats.GetCPUDataTotal().percent)); + right_aligned_text(data.colors.text, ralign_width, "%d", int(cpuStats.GetCPUDataTotal().percent)); ImGui::SameLine(0, 1.0f); ImGui::Text("%%"); // ImGui::SameLine(150); @@ -1092,7 +1096,7 @@ void render_imgui(swapchain_stats& data, struct overlay_params& params, ImVec2& if (params.enabled[OVERLAY_PARAM_ENABLED_cpu_temp]){ ImGui::TableNextCell(); - right_aligned_text(data.colors.text,ralign_width, "%i", cpuStats.GetCPUDataTotal().temp); + right_aligned_text(data.colors.text, ralign_width, "%i", cpuStats.GetCPUDataTotal().temp); ImGui::SameLine(0, 1.0f); ImGui::Text("°C"); } @@ -1109,11 +1113,11 @@ void render_imgui(swapchain_stats& data, struct overlay_params& params, ImVec2& ImGui::TextColored(data.colors.cpu,"%i", i); ImGui::PopFont(); ImGui::TableNextCell(); - right_aligned_text(data.colors.text,ralign_width, "%i", int(cpuData.percent)); + right_aligned_text(data.colors.text, ralign_width, "%i", int(cpuData.percent)); ImGui::SameLine(0, 1.0f); ImGui::Text("%%"); ImGui::TableNextCell(); - right_aligned_text(data.colors.text,ralign_width, "%i", cpuData.mhz); + right_aligned_text(data.colors.text, ralign_width, "%i", cpuData.mhz); ImGui::SameLine(0, 1.0f); ImGui::PushFont(data.font1); ImGui::Text("MHz"); @@ -1134,7 +1138,7 @@ void render_imgui(swapchain_stats& data, struct overlay_params& params, ImVec2& if (params.enabled[OVERLAY_PARAM_ENABLED_io_read]){ ImGui::TableNextCell(); float val = data.io.diff.read * 1000000 / sampling; - right_aligned_text(data.colors.text,ralign_width, val < 100 ? "%.1f" : "%.f", val); + right_aligned_text(data.colors.text, ralign_width, val < 100 ? "%.1f" : "%.f", val); ImGui::SameLine(0,1.0f); ImGui::PushFont(data.font1); ImGui::Text("MiB/s"); @@ -1143,7 +1147,7 @@ void render_imgui(swapchain_stats& data, struct overlay_params& params, ImVec2& if (params.enabled[OVERLAY_PARAM_ENABLED_io_write]){ ImGui::TableNextCell(); float val = data.io.diff.write * 1000000 / sampling; - right_aligned_text(data.colors.text,ralign_width, val < 100 ? "%.1f" : "%.f", val); + right_aligned_text(data.colors.text, ralign_width, val < 100 ? "%.1f" : "%.f", val); ImGui::SameLine(0,1.0f); ImGui::PushFont(data.font1); ImGui::Text("MiB/s"); @@ -1154,14 +1158,14 @@ void render_imgui(swapchain_stats& data, struct overlay_params& params, ImVec2& ImGui::TableNextRow(); ImGui::TextColored(data.colors.vram, "VRAM"); ImGui::TableNextCell(); - right_aligned_text(data.colors.text,ralign_width, "%.1f", gpu_info.memoryUsed); + right_aligned_text(data.colors.text, ralign_width, "%.1f", gpu_info.memoryUsed); ImGui::SameLine(0,1.0f); ImGui::PushFont(data.font1); ImGui::Text("GiB"); ImGui::PopFont(); if (params.enabled[OVERLAY_PARAM_ENABLED_gpu_mem_clock]){ ImGui::TableNextCell(); - right_aligned_text(data.colors.text,ralign_width, "%i", gpu_info.MemClock); + right_aligned_text(data.colors.text, ralign_width, "%i", gpu_info.MemClock); ImGui::SameLine(0, 1.0f); ImGui::PushFont(data.font1); ImGui::Text("MHz"); @@ -1173,7 +1177,7 @@ void render_imgui(swapchain_stats& data, struct overlay_params& params, ImVec2& ImGui::TableNextRow(); ImGui::TextColored(data.colors.ram, "RAM"); ImGui::TableNextCell(); - right_aligned_text(data.colors.text,ralign_width, "%.1f", memused); + right_aligned_text(data.colors.text, ralign_width, "%.1f", memused); ImGui::SameLine(0,1.0f); ImGui::PushFont(data.font1); ImGui::Text("GiB"); @@ -1184,13 +1188,13 @@ void render_imgui(swapchain_stats& data, struct overlay_params& params, ImVec2& ImGui::TableNextRow(); ImGui::TextColored(data.colors.engine, "%s", is_vulkan ? data.engineName.c_str() : "OpenGL"); ImGui::TableNextCell(); - right_aligned_text(data.colors.text,ralign_width, "%.0f", data.fps); + right_aligned_text(data.colors.text, ralign_width, "%.0f", data.fps); ImGui::SameLine(0, 1.0f); ImGui::PushFont(data.font1); ImGui::Text("FPS"); ImGui::PopFont(); ImGui::TableNextCell(); - right_aligned_text(data.colors.text,ralign_width, "%.1f", 1000 / data.fps); + right_aligned_text(data.colors.text, ralign_width, "%.1f", 1000 / data.fps); ImGui::SameLine(0, 1.0f); ImGui::PushFont(data.font1); ImGui::Text("ms"); From e7db65d4cd14a0aba3e95a6375464b871685820b Mon Sep 17 00:00:00 2001 From: Alessandro Toia Date: Thu, 1 Oct 2020 19:26:14 -0700 Subject: [PATCH 04/16] add function to return high/low/med, add switch for gpu load change --- src/vulkan.cpp | 48 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 34 insertions(+), 14 deletions(-) diff --git a/src/vulkan.cpp b/src/vulkan.cpp index 8354abc9..e491f801 100644 --- a/src/vulkan.cpp +++ b/src/vulkan.cpp @@ -990,6 +990,19 @@ void render_mango(swapchain_stats& data, struct overlay_params& params, ImVec2& window_size = ImVec2(window_size.x, 200); } + +int change_on_load_temp ( int info, int high, int med) { + if (info >= high){ + return 1; + } + else if (info >= med && info < high) { + return 2; + } + else { + return 3; + } +} + void render_imgui(swapchain_stats& data, struct overlay_params& params, ImVec2& window_size, bool is_vulkan) { ImGui::GetIO().FontGlobalScale = params.font_scale; @@ -1030,21 +1043,26 @@ void render_imgui(swapchain_stats& data, struct overlay_params& params, ImVec2& auto gpu_med_color = data.colors.gpu_load_med; auto gpu_low_color = data.colors.gpu_load_low; auto text_color = data.colors.text; + if (params.enabled[OVERLAY_PARAM_ENABLED_gpu_load_change]){ - if (gpu_info.load >= params.gpu_load_high){ - right_aligned_text(gpu_high_color, ralign_width, "%i", gpu_info.load); - ImGui::SameLine(0, 1.0f); - ImGui::TextColored(gpu_high_color, "%%"); - } - else if (gpu_info.load >= params.gpu_load_med && gpu_info.load < params.gpu_load_high && gpu_info.load > params.gpu_load_low) { - right_aligned_text(gpu_med_color, ralign_width, "%i", gpu_info.load); - ImGui::SameLine(0, 1.0f); - ImGui::TextColored(gpu_med_color, "%%"); - } - else { - right_aligned_text(gpu_low_color, ralign_width, "%i", gpu_info.load); - ImGui::SameLine(0, 1.0f); - ImGui::TextColored(gpu_low_color, "%%"); + int gpu_load = change_on_load_temp(gpu_info.load, params.gpu_load_high, params.gpu_load_med); + // 1 is high, 2 is medium, and 3 is low load/temp + switch (gpu_load) { + case 1: + right_aligned_text(gpu_high_color, ralign_width, "%i", gpu_info.load); + ImGui::SameLine(0, 1.0f); + ImGui::TextColored(gpu_high_color, "%%"); + break; + case 2: + right_aligned_text(gpu_med_color, ralign_width, "%i", gpu_info.load); + ImGui::SameLine(0, 1.0f); + ImGui::TextColored(gpu_med_color, "%%"); + break; + case 3: + right_aligned_text(gpu_low_color, ralign_width, "%i", gpu_info.load); + ImGui::SameLine(0, 1.0f); + ImGui::TextColored(gpu_low_color, "%%"); + break; } } else { @@ -2895,3 +2913,5 @@ extern "C" VK_LAYER_EXPORT VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL overlay_GetI if (instance_data->vtable.GetInstanceProcAddr == NULL) return NULL; return instance_data->vtable.GetInstanceProcAddr(instance, funcName); } + + From 11d9c3aa97a9789534dc1317e767086a0a69c195 Mon Sep 17 00:00:00 2001 From: Alessandro Toia Date: Sun, 4 Oct 2020 15:54:44 -0700 Subject: [PATCH 05/16] remove param gpu_load_low as it is not needed --- src/overlay_params.h | 5 ++--- src/vulkan.cpp | 2 -- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/overlay_params.h b/src/overlay_params.h index d47b908f..14d2547a 100644 --- a/src/overlay_params.h +++ b/src/overlay_params.h @@ -108,8 +108,7 @@ typedef unsigned long KeySym; OVERLAY_PARAM_CUSTOM(benchmark_percentiles) \ OVERLAY_PARAM_CUSTOM(help) \ OVERLAY_PARAM_CUSTOM(gpu_load_high) \ - OVERLAY_PARAM_CUSTOM(gpu_load_med) \ - OVERLAY_PARAM_CUSTOM(gpu_load_low) + OVERLAY_PARAM_CUSTOM(gpu_load_med) enum overlay_param_position { @@ -170,7 +169,7 @@ struct overlay_params { uint64_t log_duration; unsigned cpu_color, gpu_color, vram_color, ram_color, engine_color, io_color, frametime_color, background_color, text_color, wine_color; unsigned gpu_load_high_color,gpu_load_med_color,gpu_load_low_color; - int gpu_load_high,gpu_load_med,gpu_load_low,gpu_load_change; + int gpu_load_high,gpu_load_med,gpu_load_change; unsigned media_player_color; unsigned tableCols; unsigned render_mango; diff --git a/src/vulkan.cpp b/src/vulkan.cpp index e491f801..3b1610cd 100644 --- a/src/vulkan.cpp +++ b/src/vulkan.cpp @@ -2913,5 +2913,3 @@ extern "C" VK_LAYER_EXPORT VKAPI_ATTR PFN_vkVoidFunction VKAPI_CALL overlay_GetI if (instance_data->vtable.GetInstanceProcAddr == NULL) return NULL; return instance_data->vtable.GetInstanceProcAddr(instance, funcName); } - - From 1c0a5af001047e9a452ff876a303bb8ab299aa9b Mon Sep 17 00:00:00 2001 From: Alessandro Toia Date: Mon, 5 Oct 2020 16:41:59 -0700 Subject: [PATCH 06/16] Implement cpu load color change --- src/overlay.h | 5 ++++- src/overlay_params.cpp | 14 ++++++++++++-- src/overlay_params.h | 14 +++++++++++--- src/vulkan.cpp | 43 ++++++++++++++++++++++++++++++++++++------ 4 files changed, 64 insertions(+), 12 deletions(-) diff --git a/src/overlay.h b/src/overlay.h index 023c9955..80ca85b1 100644 --- a/src/overlay.h +++ b/src/overlay.h @@ -60,7 +60,10 @@ struct swapchain_stats { wine, gpu_load_high, gpu_load_med, - gpu_load_low; + gpu_load_low, + cpu_load_high, + cpu_load_med, + cpu_load_low; } colors; }; diff --git a/src/overlay_params.cpp b/src/overlay_params.cpp index 3a9702aa..5c78fb1f 100644 --- a/src/overlay_params.cpp +++ b/src/overlay_params.cpp @@ -329,7 +329,11 @@ parse_font_glyph_ranges(const char *str) #define parse_gpu_load_low_color(s) parse_color(s) #define parse_gpu_load_high(s) parse_unsigned(s) #define parse_gpu_load_med(s) parse_unsigned(s) -#define parse_gpu_load_low(s) parse_unsigned(s) +#define parse_cpu_load_high_color(s) parse_color(s) +#define parse_cpu_load_med_color(s) parse_color(s) +#define parse_cpu_load_low_color(s) parse_color(s) +#define parse_cpu_load_high(s) parse_unsigned(s) +#define parse_cpu_load_med(s) parse_unsigned(s) static bool parse_help(const char *str) @@ -490,6 +494,9 @@ parse_overlay_config(struct overlay_params *params, params->gpu_load_high_color=0xb22222; params->gpu_load_med_color=0xfdfd09; params->gpu_load_low_color=0x39f900; + params->cpu_load_high_color=0xb22222; + params->cpu_load_med_color=0xfdfd09; + params->cpu_load_low_color=0x39f900; params->font_scale_media_player = 0.55f; params->log_interval = 100; params->media_player_order = { MP_ORDER_TITLE, MP_ORDER_ARTIST, MP_ORDER_ALBUM }; @@ -571,7 +578,7 @@ parse_overlay_config(struct overlay_params *params, params->font_scale_media_player = 0.55f; // Convert from 0xRRGGBB to ImGui's format - std::array colors = { + std::array colors = { ¶ms->cpu_color, ¶ms->gpu_color, ¶ms->vram_color, @@ -586,6 +593,9 @@ parse_overlay_config(struct overlay_params *params, ¶ms->gpu_load_high_color, ¶ms-> gpu_load_med_color, ¶ms->gpu_load_low_color, + ¶ms->cpu_load_high_color, + ¶ms->cpu_load_med_color, + ¶ms->cpu_load_low_color, }; diff --git a/src/overlay_params.h b/src/overlay_params.h index 14d2547a..b52a1868 100644 --- a/src/overlay_params.h +++ b/src/overlay_params.h @@ -51,6 +51,7 @@ typedef unsigned long KeySym; OVERLAY_PARAM_BOOL(histogram) \ OVERLAY_PARAM_BOOL(wine) \ OVERLAY_PARAM_BOOL(gpu_load_change) \ + OVERLAY_PARAM_BOOL(cpu_load_change) \ OVERLAY_PARAM_CUSTOM(fps_sampling_period) \ OVERLAY_PARAM_CUSTOM(output_folder) \ OVERLAY_PARAM_CUSTOM(output_file) \ @@ -94,6 +95,9 @@ typedef unsigned long KeySym; OVERLAY_PARAM_CUSTOM(gpu_load_high_color) \ OVERLAY_PARAM_CUSTOM(gpu_load_med_color) \ OVERLAY_PARAM_CUSTOM(gpu_load_low_color) \ + OVERLAY_PARAM_CUSTOM(cpu_load_high_color) \ + OVERLAY_PARAM_CUSTOM(cpu_load_med_color) \ + OVERLAY_PARAM_CUSTOM(cpu_load_low_color) \ OVERLAY_PARAM_CUSTOM(alpha) \ OVERLAY_PARAM_CUSTOM(log_duration) \ OVERLAY_PARAM_CUSTOM(pci_dev) \ @@ -108,7 +112,9 @@ typedef unsigned long KeySym; OVERLAY_PARAM_CUSTOM(benchmark_percentiles) \ OVERLAY_PARAM_CUSTOM(help) \ OVERLAY_PARAM_CUSTOM(gpu_load_high) \ - OVERLAY_PARAM_CUSTOM(gpu_load_med) + OVERLAY_PARAM_CUSTOM(gpu_load_med) \ + OVERLAY_PARAM_CUSTOM(cpu_load_high) \ + OVERLAY_PARAM_CUSTOM(cpu_load_med) enum overlay_param_position { @@ -168,8 +174,10 @@ struct overlay_params { int gl_vsync; uint64_t log_duration; unsigned cpu_color, gpu_color, vram_color, ram_color, engine_color, io_color, frametime_color, background_color, text_color, wine_color; - unsigned gpu_load_high_color,gpu_load_med_color,gpu_load_low_color; - int gpu_load_high,gpu_load_med,gpu_load_change; + unsigned gpu_load_high_color, gpu_load_med_color, gpu_load_low_color; + unsigned cpu_load_high_color, cpu_load_med_color, cpu_load_low_color; + int gpu_load_high, gpu_load_med, gpu_load_change; + int cpu_load_high, cpu_load_med, cpu_load_change; unsigned media_player_color; unsigned tableCols; unsigned render_mango; diff --git a/src/vulkan.cpp b/src/vulkan.cpp index 3b1610cd..ce81d874 100644 --- a/src/vulkan.cpp +++ b/src/vulkan.cpp @@ -992,10 +992,10 @@ void render_mango(swapchain_stats& data, struct overlay_params& params, ImVec2& int change_on_load_temp ( int info, int high, int med) { - if (info >= high){ + if (info >= high) { return 1; - } - else if (info >= med && info < high) { + } + else if (info >= med && info < high) { return 2; } else { @@ -1106,9 +1106,37 @@ void render_imgui(swapchain_stats& data, struct overlay_params& params, ImVec2& cpu_text = params.cpu_text.c_str(); ImGui::TextColored(data.colors.cpu, "%s", cpu_text); ImGui::TableNextCell(); - right_aligned_text(data.colors.text, ralign_width, "%d", int(cpuStats.GetCPUDataTotal().percent)); - ImGui::SameLine(0, 1.0f); - ImGui::Text("%%"); + auto cpu_high_color = data.colors.cpu_load_high; + auto cpu_med_color = data.colors.cpu_load_med; + auto cpu_low_color = data.colors.cpu_load_low; + auto text_color = data.colors.text; + int cpu_load_percent = int(cpuStats.GetCPUDataTotal().percent); + if (params.enabled[OVERLAY_PARAM_ENABLED_cpu_load_change]){ + int cpu_load = change_on_load_temp(cpu_load_percent, params.cpu_load_high, params.cpu_load_med); + // 1 is high, 2 is medium, and 3 is low load/temp + switch (cpu_load) { + case 1: + right_aligned_text(cpu_high_color, ralign_width, "%d", cpu_load_percent); + ImGui::SameLine(0, 1.0f); + ImGui::TextColored(cpu_high_color, "%%"); + break; + case 2: + right_aligned_text(cpu_med_color, ralign_width, "%d", cpu_load_percent); + ImGui::SameLine(0, 1.0f); + ImGui::TextColored(cpu_med_color, "%%"); + break; + case 3: + right_aligned_text(cpu_low_color, ralign_width, "%d", cpu_load_percent); + ImGui::SameLine(0, 1.0f); + ImGui::TextColored(cpu_low_color, "%%"); + break; + } + } + else { + right_aligned_text(text_color, ralign_width, "%d", int(cpuStats.GetCPUDataTotal().percent)); + ImGui::SameLine(0, 1.0f); + ImGui::Text("%%"); + } // ImGui::SameLine(150); // ImGui::Text("%s", "%"); @@ -2140,6 +2168,9 @@ void convert_colors(bool do_conv, struct swapchain_stats& sw_stats, struct overl sw_stats.colors.gpu_load_high = convert(params.gpu_load_high_color); sw_stats.colors.gpu_load_med = convert(params.gpu_load_med_color); sw_stats.colors.gpu_load_low = convert(params.gpu_load_low_color); + sw_stats.colors.cpu_load_high = convert(params.cpu_load_high_color); + sw_stats.colors.cpu_load_med = convert(params.cpu_load_med_color); + sw_stats.colors.cpu_load_low = convert(params.cpu_load_low_color); ImGuiStyle& style = ImGui::GetStyle(); style.Colors[ImGuiCol_PlotLines] = convert(params.frametime_color); From 6b71c9c6e388103ed1124840724ebfe46ed117f1 Mon Sep 17 00:00:00 2001 From: Alessandro Toia Date: Tue, 6 Oct 2020 16:19:17 -0700 Subject: [PATCH 07/16] Remove duplicate code --- src/vulkan.cpp | 49 +++++++++++++++++++------------------------------ 1 file changed, 19 insertions(+), 30 deletions(-) diff --git a/src/vulkan.cpp b/src/vulkan.cpp index ce81d874..c215c670 100644 --- a/src/vulkan.cpp +++ b/src/vulkan.cpp @@ -991,7 +991,7 @@ void render_mango(swapchain_stats& data, struct overlay_params& params, ImVec2& } -int change_on_load_temp ( int info, int high, int med) { +int change_on_load_temp (int info, int high, int med) { if (info >= high) { return 1; } @@ -1039,39 +1039,33 @@ void render_imgui(swapchain_stats& data, struct overlay_params& params, ImVec2& gpu_text = params.gpu_text.c_str(); ImGui::TextColored(data.colors.gpu, "%s", gpu_text); ImGui::TableNextCell(); - auto gpu_high_color = data.colors.gpu_load_high; - auto gpu_med_color = data.colors.gpu_load_med; - auto gpu_low_color = data.colors.gpu_load_low; auto text_color = data.colors.text; - if (params.enabled[OVERLAY_PARAM_ENABLED_gpu_load_change]){ + auto load_color = data.colors.text; int gpu_load = change_on_load_temp(gpu_info.load, params.gpu_load_high, params.gpu_load_med); // 1 is high, 2 is medium, and 3 is low load/temp switch (gpu_load) { case 1: - right_aligned_text(gpu_high_color, ralign_width, "%i", gpu_info.load); - ImGui::SameLine(0, 1.0f); - ImGui::TextColored(gpu_high_color, "%%"); + load_color = data.colors.gpu_load_high; break; case 2: - right_aligned_text(gpu_med_color, ralign_width, "%i", gpu_info.load); - ImGui::SameLine(0, 1.0f); - ImGui::TextColored(gpu_med_color, "%%"); + load_color = data.colors.gpu_load_med; break; case 3: - right_aligned_text(gpu_low_color, ralign_width, "%i", gpu_info.load); - ImGui::SameLine(0, 1.0f); - ImGui::TextColored(gpu_low_color, "%%"); + load_color = data.colors.gpu_load_low; break; } + right_aligned_text(load_color, ralign_width, "%i", gpu_info.load); + ImGui::SameLine(0, 1.0f); + ImGui::TextColored(load_color,"%%"); } else { right_aligned_text(text_color, ralign_width, "%i", gpu_info.load); ImGui::SameLine(0, 1.0f); - ImGui::Text("%%"); + ImGui::TextColored(text_color,"%%"); + // ImGui::SameLine(150); + // ImGui::Text("%s", "%"); } - // ImGui::SameLine(150); - // ImGui::Text("%s", "%"); if (params.enabled[OVERLAY_PARAM_ENABLED_gpu_temp]){ ImGui::TableNextCell(); right_aligned_text(text_color, ralign_width, "%i", gpu_info.temp); @@ -1106,31 +1100,26 @@ void render_imgui(swapchain_stats& data, struct overlay_params& params, ImVec2& cpu_text = params.cpu_text.c_str(); ImGui::TextColored(data.colors.cpu, "%s", cpu_text); ImGui::TableNextCell(); - auto cpu_high_color = data.colors.cpu_load_high; - auto cpu_med_color = data.colors.cpu_load_med; - auto cpu_low_color = data.colors.cpu_load_low; auto text_color = data.colors.text; - int cpu_load_percent = int(cpuStats.GetCPUDataTotal().percent); if (params.enabled[OVERLAY_PARAM_ENABLED_cpu_load_change]){ + int cpu_load_percent = int(cpuStats.GetCPUDataTotal().percent); + auto load_color = data.colors.text; int cpu_load = change_on_load_temp(cpu_load_percent, params.cpu_load_high, params.cpu_load_med); // 1 is high, 2 is medium, and 3 is low load/temp switch (cpu_load) { case 1: - right_aligned_text(cpu_high_color, ralign_width, "%d", cpu_load_percent); - ImGui::SameLine(0, 1.0f); - ImGui::TextColored(cpu_high_color, "%%"); + load_color = data.colors.cpu_load_high; break; case 2: - right_aligned_text(cpu_med_color, ralign_width, "%d", cpu_load_percent); - ImGui::SameLine(0, 1.0f); - ImGui::TextColored(cpu_med_color, "%%"); + load_color = data.colors.cpu_load_med; break; case 3: - right_aligned_text(cpu_low_color, ralign_width, "%d", cpu_load_percent); - ImGui::SameLine(0, 1.0f); - ImGui::TextColored(cpu_low_color, "%%"); + load_color = data.colors.cpu_load_low; break; } + right_aligned_text(load_color, ralign_width, "%d", cpu_load_percent); + ImGui::SameLine(0, 1.0f); + ImGui::TextColored(load_color, "%%"); } else { right_aligned_text(text_color, ralign_width, "%d", int(cpuStats.GetCPUDataTotal().percent)); From dc0b3a99553e7c11577a15f514d40e097f5c964b Mon Sep 17 00:00:00 2001 From: Alessandro Toia Date: Tue, 6 Oct 2020 16:44:46 -0700 Subject: [PATCH 08/16] Set param defaults for load color change --- src/overlay_params.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/overlay_params.cpp b/src/overlay_params.cpp index 5c78fb1f..3fe616a4 100644 --- a/src/overlay_params.cpp +++ b/src/overlay_params.cpp @@ -466,6 +466,8 @@ parse_overlay_config(struct overlay_params *params, params->enabled[OVERLAY_PARAM_ENABLED_io_read] = false; params->enabled[OVERLAY_PARAM_ENABLED_io_write] = false; params->enabled[OVERLAY_PARAM_ENABLED_wine] = false; + params->enabled[OVERLAY_PARAM_ENABLED_gpu_load_change] = false; + params->enabled[OVERLAY_PARAM_ENABLED_cpu_load_change] = false; params->fps_sampling_period = 500000; /* 500ms */ params->width = 0; params->height = 140; @@ -503,6 +505,10 @@ parse_overlay_config(struct overlay_params *params, params->permit_upload = 0; params->render_mango = 0; params->benchmark_percentiles = { "97", "AVG", "1", "0.1" }; + params->gpu_load_high = 90; + params->gpu_load_med = 60; + params->cpu_load_high = 90; + params->cpu_load_med= 60; #ifdef HAVE_X11 params->toggle_hud = { XK_Shift_R, XK_F12 }; From 17ae05516135dc571f3d3478f21a2b58bb42e589 Mon Sep 17 00:00:00 2001 From: Alessandro Toia Date: Tue, 6 Oct 2020 16:53:27 -0700 Subject: [PATCH 09/16] Disable cpu/gpu load change from full param output --- src/overlay_params.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/overlay_params.cpp b/src/overlay_params.cpp index 3fe616a4..ced336f8 100644 --- a/src/overlay_params.cpp +++ b/src/overlay_params.cpp @@ -425,6 +425,8 @@ parse_overlay_env(struct overlay_params *params, #undef OVERLAY_PARAM_BOOL #undef OVERLAY_PARAM_CUSTOM params->enabled[OVERLAY_PARAM_ENABLED_histogram] = 0; + params->enabled[OVERLAY_PARAM_ENABLED_gpu_load_change] = 0; + params->enabled[OVERLAY_PARAM_ENABLED_cpu_load_change] = 0; params->enabled[OVERLAY_PARAM_ENABLED_read_cfg] = read_cfg; } #define OVERLAY_PARAM_BOOL(name) \ From 5e486df67f1419a534ef16eb29e94f5abd796ae5 Mon Sep 17 00:00:00 2001 From: Alessandro Toia Date: Tue, 6 Oct 2020 16:59:47 -0700 Subject: [PATCH 10/16] Fix spacing --- src/overlay_params.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/overlay_params.cpp b/src/overlay_params.cpp index ced336f8..0edc740e 100644 --- a/src/overlay_params.cpp +++ b/src/overlay_params.cpp @@ -495,12 +495,12 @@ parse_overlay_config(struct overlay_params *params, params->media_player_name = ""; params->font_scale = 1.0f; params->wine_color = 0xeb5b5b; - params->gpu_load_high_color=0xb22222; - params->gpu_load_med_color=0xfdfd09; - params->gpu_load_low_color=0x39f900; - params->cpu_load_high_color=0xb22222; - params->cpu_load_med_color=0xfdfd09; - params->cpu_load_low_color=0x39f900; + params->gpu_load_high_color = 0xb22222; + params->gpu_load_med_color = 0xfdfd09; + params->gpu_load_low_color = 0x39f900; + params->cpu_load_high_color = 0xb22222; + params->cpu_load_med_color = 0xfdfd09; + params->cpu_load_low_color = 0x39f900; params->font_scale_media_player = 0.55f; params->log_interval = 100; params->media_player_order = { MP_ORDER_TITLE, MP_ORDER_ARTIST, MP_ORDER_ALBUM }; @@ -510,7 +510,7 @@ parse_overlay_config(struct overlay_params *params, params->gpu_load_high = 90; params->gpu_load_med = 60; params->cpu_load_high = 90; - params->cpu_load_med= 60; + params->cpu_load_med = 60; #ifdef HAVE_X11 params->toggle_hud = { XK_Shift_R, XK_F12 }; @@ -599,7 +599,7 @@ parse_overlay_config(struct overlay_params *params, ¶ms->media_player_color, ¶ms->wine_color, ¶ms->gpu_load_high_color, - ¶ms-> gpu_load_med_color, + ¶ms->gpu_load_med_color, ¶ms->gpu_load_low_color, ¶ms->cpu_load_high_color, ¶ms->cpu_load_med_color, From e1269a18ff0376c21f7d7f2203187bff28e53230 Mon Sep 17 00:00:00 2001 From: Alessandro Toia Date: Mon, 19 Oct 2020 20:41:39 -0700 Subject: [PATCH 11/16] Consolidate gpu load color config --- src/overlay_params.cpp | 28 +++++++++++++++++++--------- src/overlay_params.h | 9 +++------ src/vulkan.cpp | 10 +++++++--- 3 files changed, 29 insertions(+), 18 deletions(-) diff --git a/src/overlay_params.cpp b/src/overlay_params.cpp index 0edc740e..216364f6 100644 --- a/src/overlay_params.cpp +++ b/src/overlay_params.cpp @@ -152,6 +152,19 @@ parse_color(const char *str) return strtol(str, NULL, 16); } +static std::vector +parse_load_color(const char *str) +{ + std::vector load_colors; + std::stringstream ss(str); + std::string token; + while (std::getline(ss, token, ',')) { + trim(token); + load_colors.push_back(std::stoi(token, NULL, 16)); + } + return load_colors; +} + static unsigned parse_unsigned(const char *str) { @@ -324,9 +337,7 @@ parse_font_glyph_ranges(const char *str) #define parse_text_color(s) parse_color(s) #define parse_media_player_color(s) parse_color(s) #define parse_wine_color(s) parse_color(s) -#define parse_gpu_load_high_color(s) parse_color(s) -#define parse_gpu_load_med_color(s) parse_color(s) -#define parse_gpu_load_low_color(s) parse_color(s) +#define parse_gpu_load_color(s) parse_load_color(s) #define parse_gpu_load_high(s) parse_unsigned(s) #define parse_gpu_load_med(s) parse_unsigned(s) #define parse_cpu_load_high_color(s) parse_color(s) @@ -495,9 +506,7 @@ parse_overlay_config(struct overlay_params *params, params->media_player_name = ""; params->font_scale = 1.0f; params->wine_color = 0xeb5b5b; - params->gpu_load_high_color = 0xb22222; - params->gpu_load_med_color = 0xfdfd09; - params->gpu_load_low_color = 0x39f900; + params->gpu_load_color = {0xb22222,0xfdfd09,0x39f900}; params->cpu_load_high_color = 0xb22222; params->cpu_load_med_color = 0xfdfd09; params->cpu_load_low_color = 0x39f900; @@ -512,6 +521,7 @@ parse_overlay_config(struct overlay_params *params, params->cpu_load_high = 90; params->cpu_load_med = 60; + #ifdef HAVE_X11 params->toggle_hud = { XK_Shift_R, XK_F12 }; params->toggle_fps_limit = { XK_Shift_L, XK_F1 }; @@ -598,12 +608,12 @@ parse_overlay_config(struct overlay_params *params, ¶ms->text_color, ¶ms->media_player_color, ¶ms->wine_color, - ¶ms->gpu_load_high_color, - ¶ms->gpu_load_med_color, - ¶ms->gpu_load_low_color, ¶ms->cpu_load_high_color, ¶ms->cpu_load_med_color, ¶ms->cpu_load_low_color, + ¶ms->gpu_load_color[0], + ¶ms->gpu_load_color[1], + ¶ms->gpu_load_color[2], }; diff --git a/src/overlay_params.h b/src/overlay_params.h index b52a1868..84e880ef 100644 --- a/src/overlay_params.h +++ b/src/overlay_params.h @@ -92,9 +92,6 @@ typedef unsigned long KeySym; OVERLAY_PARAM_CUSTOM(io_color) \ OVERLAY_PARAM_CUSTOM(text_color) \ OVERLAY_PARAM_CUSTOM (wine_color) \ - OVERLAY_PARAM_CUSTOM(gpu_load_high_color) \ - OVERLAY_PARAM_CUSTOM(gpu_load_med_color) \ - OVERLAY_PARAM_CUSTOM(gpu_load_low_color) \ OVERLAY_PARAM_CUSTOM(cpu_load_high_color) \ OVERLAY_PARAM_CUSTOM(cpu_load_med_color) \ OVERLAY_PARAM_CUSTOM(cpu_load_low_color) \ @@ -114,7 +111,8 @@ typedef unsigned long KeySym; OVERLAY_PARAM_CUSTOM(gpu_load_high) \ OVERLAY_PARAM_CUSTOM(gpu_load_med) \ OVERLAY_PARAM_CUSTOM(cpu_load_high) \ - OVERLAY_PARAM_CUSTOM(cpu_load_med) + OVERLAY_PARAM_CUSTOM(cpu_load_med) \ + OVERLAY_PARAM_CUSTOM (gpu_load_color) enum overlay_param_position { @@ -174,8 +172,8 @@ struct overlay_params { int gl_vsync; uint64_t log_duration; unsigned cpu_color, gpu_color, vram_color, ram_color, engine_color, io_color, frametime_color, background_color, text_color, wine_color; - unsigned gpu_load_high_color, gpu_load_med_color, gpu_load_low_color; unsigned cpu_load_high_color, cpu_load_med_color, cpu_load_low_color; + std::vector gpu_load_color; int gpu_load_high, gpu_load_med, gpu_load_change; int cpu_load_high, cpu_load_med, cpu_load_change; unsigned media_player_color; @@ -198,7 +196,6 @@ struct overlay_params { unsigned log_interval; std::vector media_player_order; std::vector benchmark_percentiles; - std::string font_file, font_file_text; uint32_t font_glyph_ranges; diff --git a/src/vulkan.cpp b/src/vulkan.cpp index c215c670..9ab35240 100644 --- a/src/vulkan.cpp +++ b/src/vulkan.cpp @@ -1046,6 +1046,7 @@ void render_imgui(swapchain_stats& data, struct overlay_params& params, ImVec2& // 1 is high, 2 is medium, and 3 is low load/temp switch (gpu_load) { case 1: + ///load_color = data.colors.gpu_load_high; load_color = data.colors.gpu_load_high; break; case 2: @@ -2154,13 +2155,16 @@ void convert_colors(bool do_conv, struct swapchain_stats& sw_stats, struct overl sw_stats.colors.text = convert(params.text_color); sw_stats.colors.media_player = convert(params.media_player_color); sw_stats.colors.wine = convert(params.wine_color); - sw_stats.colors.gpu_load_high = convert(params.gpu_load_high_color); - sw_stats.colors.gpu_load_med = convert(params.gpu_load_med_color); - sw_stats.colors.gpu_load_low = convert(params.gpu_load_low_color); + sw_stats.colors.gpu_load_high = convert(params.gpu_load_color[0]); + sw_stats.colors.gpu_load_med = convert(params.gpu_load_color[1]); + sw_stats.colors.gpu_load_low = convert(params.gpu_load_color[2]); + sw_stats.colors.cpu_load_high = convert(params.cpu_load_high_color); sw_stats.colors.cpu_load_med = convert(params.cpu_load_med_color); sw_stats.colors.cpu_load_low = convert(params.cpu_load_low_color); + + ImGuiStyle& style = ImGui::GetStyle(); style.Colors[ImGuiCol_PlotLines] = convert(params.frametime_color); style.Colors[ImGuiCol_PlotHistogram] = convert(params.frametime_color); From daa23d49db2017a2da2652682a0e457e614a9b0a Mon Sep 17 00:00:00 2001 From: Alessandro Toia Date: Mon, 19 Oct 2020 21:06:10 -0700 Subject: [PATCH 12/16] Consolidate cpu load color config --- src/overlay_params.cpp | 16 ++++++---------- src/overlay_params.h | 8 +++----- src/vulkan.cpp | 8 +++----- 3 files changed, 12 insertions(+), 20 deletions(-) diff --git a/src/overlay_params.cpp b/src/overlay_params.cpp index 216364f6..6c4ccd97 100644 --- a/src/overlay_params.cpp +++ b/src/overlay_params.cpp @@ -338,11 +338,9 @@ parse_font_glyph_ranges(const char *str) #define parse_media_player_color(s) parse_color(s) #define parse_wine_color(s) parse_color(s) #define parse_gpu_load_color(s) parse_load_color(s) +#define parse_cpu_load_color(s) parse_load_color(s) #define parse_gpu_load_high(s) parse_unsigned(s) #define parse_gpu_load_med(s) parse_unsigned(s) -#define parse_cpu_load_high_color(s) parse_color(s) -#define parse_cpu_load_med_color(s) parse_color(s) -#define parse_cpu_load_low_color(s) parse_color(s) #define parse_cpu_load_high(s) parse_unsigned(s) #define parse_cpu_load_med(s) parse_unsigned(s) @@ -506,10 +504,8 @@ parse_overlay_config(struct overlay_params *params, params->media_player_name = ""; params->font_scale = 1.0f; params->wine_color = 0xeb5b5b; - params->gpu_load_color = {0xb22222,0xfdfd09,0x39f900}; - params->cpu_load_high_color = 0xb22222; - params->cpu_load_med_color = 0xfdfd09; - params->cpu_load_low_color = 0x39f900; + params->gpu_load_color = { 0xb22222, 0xfdfd09, 0x39f900 }; + params->cpu_load_color = { 0xb22222, 0xfdfd09, 0x39f900 }; params->font_scale_media_player = 0.55f; params->log_interval = 100; params->media_player_order = { MP_ORDER_TITLE, MP_ORDER_ARTIST, MP_ORDER_ALBUM }; @@ -608,12 +604,12 @@ parse_overlay_config(struct overlay_params *params, ¶ms->text_color, ¶ms->media_player_color, ¶ms->wine_color, - ¶ms->cpu_load_high_color, - ¶ms->cpu_load_med_color, - ¶ms->cpu_load_low_color, ¶ms->gpu_load_color[0], ¶ms->gpu_load_color[1], ¶ms->gpu_load_color[2], + ¶ms->cpu_load_color[0], + ¶ms->cpu_load_color[1], + ¶ms->cpu_load_color[2], }; diff --git a/src/overlay_params.h b/src/overlay_params.h index 84e880ef..48dde29d 100644 --- a/src/overlay_params.h +++ b/src/overlay_params.h @@ -92,9 +92,6 @@ typedef unsigned long KeySym; OVERLAY_PARAM_CUSTOM(io_color) \ OVERLAY_PARAM_CUSTOM(text_color) \ OVERLAY_PARAM_CUSTOM (wine_color) \ - OVERLAY_PARAM_CUSTOM(cpu_load_high_color) \ - OVERLAY_PARAM_CUSTOM(cpu_load_med_color) \ - OVERLAY_PARAM_CUSTOM(cpu_load_low_color) \ OVERLAY_PARAM_CUSTOM(alpha) \ OVERLAY_PARAM_CUSTOM(log_duration) \ OVERLAY_PARAM_CUSTOM(pci_dev) \ @@ -112,7 +109,8 @@ typedef unsigned long KeySym; OVERLAY_PARAM_CUSTOM(gpu_load_med) \ OVERLAY_PARAM_CUSTOM(cpu_load_high) \ OVERLAY_PARAM_CUSTOM(cpu_load_med) \ - OVERLAY_PARAM_CUSTOM (gpu_load_color) + OVERLAY_PARAM_CUSTOM (gpu_load_color) \ + OVERLAY_PARAM_CUSTOM (cpu_load_color) enum overlay_param_position { @@ -172,8 +170,8 @@ struct overlay_params { int gl_vsync; uint64_t log_duration; unsigned cpu_color, gpu_color, vram_color, ram_color, engine_color, io_color, frametime_color, background_color, text_color, wine_color; - unsigned cpu_load_high_color, cpu_load_med_color, cpu_load_low_color; std::vector gpu_load_color; + std::vector cpu_load_color; int gpu_load_high, gpu_load_med, gpu_load_change; int cpu_load_high, cpu_load_med, cpu_load_change; unsigned media_player_color; diff --git a/src/vulkan.cpp b/src/vulkan.cpp index 9ab35240..5ed9f6a9 100644 --- a/src/vulkan.cpp +++ b/src/vulkan.cpp @@ -1046,7 +1046,6 @@ void render_imgui(swapchain_stats& data, struct overlay_params& params, ImVec2& // 1 is high, 2 is medium, and 3 is low load/temp switch (gpu_load) { case 1: - ///load_color = data.colors.gpu_load_high; load_color = data.colors.gpu_load_high; break; case 2: @@ -2158,10 +2157,9 @@ void convert_colors(bool do_conv, struct swapchain_stats& sw_stats, struct overl sw_stats.colors.gpu_load_high = convert(params.gpu_load_color[0]); sw_stats.colors.gpu_load_med = convert(params.gpu_load_color[1]); sw_stats.colors.gpu_load_low = convert(params.gpu_load_color[2]); - - sw_stats.colors.cpu_load_high = convert(params.cpu_load_high_color); - sw_stats.colors.cpu_load_med = convert(params.cpu_load_med_color); - sw_stats.colors.cpu_load_low = convert(params.cpu_load_low_color); + sw_stats.colors.cpu_load_high = convert(params.cpu_load_color[0]); + sw_stats.colors.cpu_load_med = convert(params.cpu_load_color[1]); + sw_stats.colors.cpu_load_low = convert(params.cpu_load_color[2]); From c53939587a839aa14f8d9f751e635ca2577f5824 Mon Sep 17 00:00:00 2001 From: Alessandro Toia Date: Mon, 19 Oct 2020 22:11:26 -0700 Subject: [PATCH 13/16] Consolidate gpu/cpu load value config --- src/overlay_params.cpp | 27 +++++++++++++++++++-------- src/overlay_params.h | 8 ++++---- src/vulkan.cpp | 4 ++-- 3 files changed, 25 insertions(+), 14 deletions(-) diff --git a/src/overlay_params.cpp b/src/overlay_params.cpp index 6c4ccd97..44cc86dd 100644 --- a/src/overlay_params.cpp +++ b/src/overlay_params.cpp @@ -165,6 +165,20 @@ parse_load_color(const char *str) return load_colors; } +static std::vector +parse_load_value(const char *str) +{ + std::vector load_value; + std::stringstream ss(str); + std::string token; + while (std::getline(ss, token, ',')) { + trim(token); + load_value.push_back(std::stoi(token)); + } + return load_value; +} + + static unsigned parse_unsigned(const char *str) { @@ -339,10 +353,8 @@ parse_font_glyph_ranges(const char *str) #define parse_wine_color(s) parse_color(s) #define parse_gpu_load_color(s) parse_load_color(s) #define parse_cpu_load_color(s) parse_load_color(s) -#define parse_gpu_load_high(s) parse_unsigned(s) -#define parse_gpu_load_med(s) parse_unsigned(s) -#define parse_cpu_load_high(s) parse_unsigned(s) -#define parse_cpu_load_med(s) parse_unsigned(s) +#define parse_gpu_load_value(s) parse_load_value(s) +#define parse_cpu_load_value(s) parse_load_value(s) static bool parse_help(const char *str) @@ -512,10 +524,9 @@ parse_overlay_config(struct overlay_params *params, params->permit_upload = 0; params->render_mango = 0; params->benchmark_percentiles = { "97", "AVG", "1", "0.1" }; - params->gpu_load_high = 90; - params->gpu_load_med = 60; - params->cpu_load_high = 90; - params->cpu_load_med = 60; + params->gpu_load_value = { 90, 60 }; + params->cpu_load_value = { 90, 60 }; + #ifdef HAVE_X11 diff --git a/src/overlay_params.h b/src/overlay_params.h index 48dde29d..53edcd0e 100644 --- a/src/overlay_params.h +++ b/src/overlay_params.h @@ -105,10 +105,8 @@ typedef unsigned long KeySym; OVERLAY_PARAM_CUSTOM(render_mango) \ OVERLAY_PARAM_CUSTOM(benchmark_percentiles) \ OVERLAY_PARAM_CUSTOM(help) \ - OVERLAY_PARAM_CUSTOM(gpu_load_high) \ - OVERLAY_PARAM_CUSTOM(gpu_load_med) \ - OVERLAY_PARAM_CUSTOM(cpu_load_high) \ - OVERLAY_PARAM_CUSTOM(cpu_load_med) \ + OVERLAY_PARAM_CUSTOM(gpu_load_value) \ + OVERLAY_PARAM_CUSTOM(cpu_load_value) \ OVERLAY_PARAM_CUSTOM (gpu_load_color) \ OVERLAY_PARAM_CUSTOM (cpu_load_color) @@ -172,6 +170,8 @@ struct overlay_params { unsigned cpu_color, gpu_color, vram_color, ram_color, engine_color, io_color, frametime_color, background_color, text_color, wine_color; std::vector gpu_load_color; std::vector cpu_load_color; + std::vector gpu_load_value; + std::vector cpu_load_value; int gpu_load_high, gpu_load_med, gpu_load_change; int cpu_load_high, cpu_load_med, cpu_load_change; unsigned media_player_color; diff --git a/src/vulkan.cpp b/src/vulkan.cpp index 5ed9f6a9..563080ef 100644 --- a/src/vulkan.cpp +++ b/src/vulkan.cpp @@ -1042,7 +1042,7 @@ void render_imgui(swapchain_stats& data, struct overlay_params& params, ImVec2& auto text_color = data.colors.text; if (params.enabled[OVERLAY_PARAM_ENABLED_gpu_load_change]){ auto load_color = data.colors.text; - int gpu_load = change_on_load_temp(gpu_info.load, params.gpu_load_high, params.gpu_load_med); + int gpu_load = change_on_load_temp(gpu_info.load, params.gpu_load_value[0], params.gpu_load_value[1]); // 1 is high, 2 is medium, and 3 is low load/temp switch (gpu_load) { case 1: @@ -1104,7 +1104,7 @@ void render_imgui(swapchain_stats& data, struct overlay_params& params, ImVec2& if (params.enabled[OVERLAY_PARAM_ENABLED_cpu_load_change]){ int cpu_load_percent = int(cpuStats.GetCPUDataTotal().percent); auto load_color = data.colors.text; - int cpu_load = change_on_load_temp(cpu_load_percent, params.cpu_load_high, params.cpu_load_med); + int cpu_load = change_on_load_temp(cpu_load_percent, params.cpu_load_value[0], params.cpu_load_value[1]); // 1 is high, 2 is medium, and 3 is low load/temp switch (cpu_load) { case 1: From 3e446f7c111224947d5a8e9b0418d251d1e0606b Mon Sep 17 00:00:00 2001 From: Alessandro Toia Date: Tue, 20 Oct 2020 20:42:57 -0700 Subject: [PATCH 14/16] Remove unused variables --- src/overlay_params.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/overlay_params.h b/src/overlay_params.h index 53edcd0e..a86ad872 100644 --- a/src/overlay_params.h +++ b/src/overlay_params.h @@ -172,8 +172,7 @@ struct overlay_params { std::vector cpu_load_color; std::vector gpu_load_value; std::vector cpu_load_value; - int gpu_load_high, gpu_load_med, gpu_load_change; - int cpu_load_high, cpu_load_med, cpu_load_change; + int gpu_load_change, cpu_load_change; unsigned media_player_color; unsigned tableCols; unsigned render_mango; From 76c2129ae25eb97cb65f4842f855f26394429298 Mon Sep 17 00:00:00 2001 From: Alessandro Toia Date: Tue, 20 Oct 2020 20:46:35 -0700 Subject: [PATCH 15/16] Remove more unused variables --- src/overlay_params.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/overlay_params.h b/src/overlay_params.h index a86ad872..02983d20 100644 --- a/src/overlay_params.h +++ b/src/overlay_params.h @@ -172,7 +172,7 @@ struct overlay_params { std::vector cpu_load_color; std::vector gpu_load_value; std::vector cpu_load_value; - int gpu_load_change, cpu_load_change; + //int gpu_load_change, cpu_load_change; unsigned media_player_color; unsigned tableCols; unsigned render_mango; From ec322b556e972ab2a7fe57303eb66e2ac1ccaf20 Mon Sep 17 00:00:00 2001 From: Alessandro Toia Date: Tue, 20 Oct 2020 21:14:04 -0700 Subject: [PATCH 16/16] Formatting fixes, remove commented code --- src/overlay_params.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/overlay_params.h b/src/overlay_params.h index 02983d20..b814e185 100644 --- a/src/overlay_params.h +++ b/src/overlay_params.h @@ -107,8 +107,8 @@ typedef unsigned long KeySym; OVERLAY_PARAM_CUSTOM(help) \ OVERLAY_PARAM_CUSTOM(gpu_load_value) \ OVERLAY_PARAM_CUSTOM(cpu_load_value) \ - OVERLAY_PARAM_CUSTOM (gpu_load_color) \ - OVERLAY_PARAM_CUSTOM (cpu_load_color) + OVERLAY_PARAM_CUSTOM(gpu_load_color) \ + OVERLAY_PARAM_CUSTOM(cpu_load_color) enum overlay_param_position { @@ -172,7 +172,6 @@ struct overlay_params { std::vector cpu_load_color; std::vector gpu_load_value; std::vector cpu_load_value; - //int gpu_load_change, cpu_load_change; unsigned media_player_color; unsigned tableCols; unsigned render_mango;