-
Notifications
You must be signed in to change notification settings - Fork 291
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Expose stats of all GPUs #532
base: develop
Are you sure you want to change the base?
Conversation
Next time just do |
Yeah well I had it in |
@@ -65,12 +65,18 @@ void update_hw_info(struct swapchain_stats& sw_stats, struct overlay_params& par | |||
// Save data for graphs | |||
if (graph_data.size() > 50) | |||
graph_data.erase(graph_data.begin()); | |||
graph_data.push_back(currentLogData); | |||
#ifdef _WIN32 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This chunk is pointless it seems
src/vulkan.cpp
Outdated
@@ -614,11 +638,11 @@ void init_system_info(){ | |||
const char* mangohud_recursion = getenv("MANGOHUD_RECURSION"); | |||
if (!mangohud_recursion) { | |||
setenv("MANGOHUD_RECURSION", "1", 1); | |||
driver = exec("glxinfo -B | grep 'OpenGL version' | sed 's/^.*: //' | sed 's/([^()]*)//g' | tr -s ' '"); | |||
driver = exec("glxinfo -B | grep 'OpenGL version' | sed 's/^.*: //' | cut -d' ' --output-delimiter=$'\n' -f1- | grep -v '(' | grep -v ')' | tr '\n' ' ' | cut -c 1-"); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Unrelated change from rebasing?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah I guess those are left over from merge conflict resolution
src/vulkan.cpp
Outdated
trim(driver); | ||
unsetenv("MANGOHUD_RECURSION"); | ||
} else { | ||
driver = "MangoHud glxinfo recursion detected"; | ||
driver = "MangoHud glxinfo recurssion detected"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Unrelated change from rebasing
ImGui::TableNextRow(); ImGui::TableNextColumn(); | ||
const char* gpu_text; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Any reason for turning it into std::string instead?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I was concatenating the name of the GPU. I've since put that on a separate hud element but we could keep it as a std::string
in case we need to add GPU indices (GPU 1,GPU 2 etc)
7ddf1f2
to
5330573
Compare
…into flightlessmango-develop
Thought going with a bit more cpp-ish way, check https://github.com/flightlessmango/MangoHud/tree/libdrm-radeon |
df28d9b
to
fe7113e
Compare
4373855
to
947f287
Compare
Is this way enough? https://github.com/flightlessmango/MangoHud/tree/multi-gpu |
This is #531 rebased against develop.