From 4fd1c5f3e76b034b665d3d622fb7f45264f7e54a Mon Sep 17 00:00:00 2001 From: FlightlessMango Date: Sun, 2 Aug 2020 08:25:04 +0200 Subject: [PATCH] Fixed some basic errors --- src/logging.cpp | 2 +- src/overlay.cpp | 1 - src/overlay.h | 2 +- src/overlay_params.cpp | 1 + 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/logging.cpp b/src/logging.cpp index 757edc1b..04c69d52 100644 --- a/src/logging.cpp +++ b/src/logging.cpp @@ -119,7 +119,7 @@ void Logger::stop_logging() { m_logging_on = false; m_log_end = Clock::now(); - std::thread(calculate_benchmark_data).detach(); + std::thread(calculate_benchmark_data, m_params).detach(); if(not m_params->output_file.empty()) { m_log_files.emplace_back(m_params->output_file + get_log_suffix()); diff --git a/src/overlay.cpp b/src/overlay.cpp index 6cc632c1..47417f57 100644 --- a/src/overlay.cpp +++ b/src/overlay.cpp @@ -1069,7 +1069,6 @@ void render_benchmark(swapchain_stats& data, struct overlay_params& params, ImVe else ImGui::SetNextWindowPos(ImVec2(data.main_window_pos.x, data.main_window_pos.y + window_size.y + 5), ImGuiCond_Always); - vector> benchmark_data = {{"97% ", benchmark.ninety}, {"AVG ", benchmark.avg}, {"1% ", benchmark.oneP}, {"0.1%", benchmark.pointOneP}}; float display_time = std::chrono::duration(now - logger->last_log_end()).count(); static float display_for = 10.0f; float alpha; diff --git a/src/overlay.h b/src/overlay.h index 18a40c02..3f55dbd0 100644 --- a/src/overlay.h +++ b/src/overlay.h @@ -78,7 +78,7 @@ void init_system_info(void); void FpsLimiter(struct fps_limit& stats); void imgui_custom_style(struct overlay_params& params); void get_device_name(int32_t vendorID, int32_t deviceID, struct swapchain_stats& sw_stats); -void calculate_benchmark_data(void); +void calculate_benchmark_data(void *params_void); void create_fonts(const overlay_params& params, ImFont*& small_font, ImFont*& text_font); #endif //MANGOHUD_OVERLAY_H \ No newline at end of file diff --git a/src/overlay_params.cpp b/src/overlay_params.cpp index e988082d..447eac25 100644 --- a/src/overlay_params.cpp +++ b/src/overlay_params.cpp @@ -242,6 +242,7 @@ parse_benchmark_percentiles(const char *str) } return percentiles; +} static uint32_t parse_font_glyph_ranges(const char *str)