Consolidate cpu load color config

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,
       &params->text_color,
       &params->media_player_color,
       &params->wine_color,
-      &params->cpu_load_high_color,
-      &params->cpu_load_med_color,
-      &params->cpu_load_low_color,
       &params->gpu_load_color[0],
       &params->gpu_load_color[1],
       &params->gpu_load_color[2],
+      &params->cpu_load_color[0],
+      &params->cpu_load_color[1],
+      &params->cpu_load_color[2],
 
    };
 

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<unsigned> gpu_load_color;
+   std::vector<unsigned> 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;

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]);