Commit Graph

1218 Commits (95b7b44b6ff9057d56321cd05051dc81212d276d)

Author SHA1 Message Date
Alessandro Toia f76527d14f Revert "Fix reporting temp of AMD zen4 CPUs"
This reverts commit edac405d57.
Didn't actually fix the issue oops
1 year ago
FlightlessMango 0ae106dba5 hud_elements: remove extra '}' 1 year ago
Echo J ba7e2cb313 Logging: Switch to a different sleep function
This fixes a freeze with zink when automatic logging is enabled

I didn't test this on Windows, so please report any issues there
1 year ago
FlightlessMango 7c54ea819c params: exec_name: don't show unless enabled 1 year ago
FlightlessMango 99c72d30cf check for mangoapp_layer option for manifest 1 year ago
FlightlessMango abb5359cdd Blacklist: add gamescope
Co-authored-by: Valters <valters.tomsons@protonmail.com>
1 year ago
Alessandro Toia f7c3ec2072 Add redlauncher(CDPR) to blacklist 1 year ago
Alessandro Toia edac405d57 Fix reporting temp of AMD zen4 CPUs, zen4 doesn't use Tdie, use Tctl instead 1 year ago
Bitwolf a67ba60773 Blacklist GOG Galaxy 2.0
FPS counter appears in the client, it probably shouldn't.
1 year ago
FlightlessMango d4aa74c149 Create static and shared libs separately 1 year ago
FlightlessMango 6f23cdeaf1 mangoapp: meson option to install lib32 1 year ago
FlightlessMango 03d64e5afb params: exec_name 1 year ago
Alessandro Toia b2bcd889f0 Skip OpenGL impl if vulkan is loaded togther with zink or wined3d. 1 year ago
FlightlessMango e3995ffcbf mangoapp: compile using static mangohud_library 2 years ago
Alessandro Toia 7b248efef7 Check if libvulkan is loaded when opengl is also loaded and skip opengl rendering
Fixes #866 #852 issues with zink and multiple games using DXVK that load OpenGL for some reason
2 years ago
Alessandro Toia b61f83f522 Add lib_loaded function to check for current loaded libraries 2 years ago
Kurt Kartaltepe 1a3fa6e4ff overlay: Fixup device detection on intel GPUs
This resolves missing GPU names due to deviceID only being computed for
AMD gpus. It also filters out display adapters so there is less noise in
the logs when scanning cards.
2 years ago
FlightlessMango 7dee12a75a params: toggle_hud_position 2 years ago
FlightlessMango 61596104ce params: hud_compact default off 2 years ago
Alessandro Toia 5bf4091cdf Add window padding if hud_compact = 0 2 years ago
FlightlessMango ddbb4f5be1 intel: use json for parsing intel_gpu_top output 2 years ago
FlightlessMango f8ca49f627 allow for compact hud layout 2 years ago
FlightlessMango e38413b2d8 use intel_gpu_top for gpu stats 2 years ago
Zebediah Figura 2f01d15690 Bind a zero pixel unpack buffer if necessary when uploading fonts texture 2 years ago
FlightlessMango e6c5ff4a4b overlay.cpp: fixed renamed check metrics function 2 years ago
FlightlessMango cb7d2a2447 amdgpu tests 2 years ago
Gustavo Parreira 96f72e2352 fix: Look for NAVI in device name for AMD GPUs 2 years ago
Vir Chaudhury c670203a5b add logging for when the OpenGL context fails to initialize 2 years ago
Stephan Lachnit b8b6d61b25 Build mangoapp and mangohudctl for any CPU architecture
On 32-bit-only machines, building these for the 32-bit architecture makes sense.

Signed-off-by: Simon McVittie <smcv@debian.org>
2 years ago
Deis Dupeyron b46908bdbc src/battery.cpp: fix getTimeRemaining for energy_now 2 years ago
FlightlessMango ebb0f969de params: don't enable hud_no_margin and log_versioning with full 2 years ago
FlightlessMango a76e8a26f5 hud elements: battery: adjust remaining time for normal and horizontal view 2 years ago
FlightlessMango 57c4e4e6c2 increase width based on table_columns 2 years ago
FlightlessMango bc89947df0 hud_elements: battery: don't show plug or watt in horizontal 2 years ago
FlightlessMango 4f49ffea7b frame_timing: minor adjustments for horizontal and mangoapp 2 years ago
FlightlessMango 3949c6c87f amdgpu: change cpu/gpu temps from max to avg 2 years ago
MasterDevX 99f0e4139c Add support for it8603 sensor 2 years ago
FlightlessMango d0a1c4ea07 horizontal view and hud_no_margin 2 years ago
jackun dcabe6b33f
Explicitly include array 2 years ago
jackun 021df9b932
`env -u` doesn't affect "piped" commands, use `unset` instead 2 years ago
jackun a05dd84bf5
Don't use unsetenv in `exec`
Hopefully fixes #809
2 years ago
Alessandro Toia 08431a0221 Fix reporting amdgpu clock speed 2 years ago
FlightlessMango 5f43fcd121 logger: control: use hudelements 2 years ago
FlightlessMango e9a7865a90 logger: reinit on config reload 2 years ago
tisim 732439b8e6 changing Logger class from struct pointer to 3 variables
removing commented line of code
2 years ago
jackun 85007fe0bd
Use separate font atlas for vulkan
vkCreateSwapchainKHR and vkQueuePresentKHR may share the same ImGui context accidentally and
vkCreateSwapchainKHR might (re)create font image and destroy old font atlas while vkQueuePresentKHR is still rendering :(
2 years ago
FlightlessMango 14dcd153ae control: send msg when log stops 2 years ago
FlightlessMango ef4ace2e2a logging: versioning 2 years ago
Alessandro Toia 52c24afae9 Don't check for conf file if blacklisted 2 years ago
jackun 05133ae3cd
When `pci_dev` is set, don't skip AMD gpu if device id doesn't match 2 years ago
jackun e132bb9268
Lower api minor version
Apparently too new of a version implicit layer might also not get loaded
2 years ago
jackun e5d52c202e
Add meson install_tags, bump meson to 0.60 2 years ago
jackun 50720d2215
Install data files only if `include_doc` option is set 2 years ago
Stephan Lachnit 5709832576 Install MangoApp layer into libdir_mangohud
This makes the installation path adapt correctly to the value of
the append_libdir_mangohud option, which defaults to putting it in a
subdirectory ${libdir}/mangohud. Without this, the path in the JSON
manifest (which does respect append_libdir_mangohud) is inconsistent
with the actual location of the library.

Resolves: https://github.com/flightlessmango/MangoHud/issues/795
Co-authored-by: Simon McVittie <smcv@collabora.com>
2 years ago
jackun c6bc257e11
Remove unnecessary row/column changes in HudElements::gpu_stats
Somehow missed these. Fixes f78107e6
2 years ago
jackun 032abbb031
Fix mangoapp frame time alignment 2 years ago
jackun 61716494c1
Check if data logger is valid 2 years ago
jackun acfc62a434
Check if ImGui::BeginTable actually begun 2 years ago
FlightlessMango 421ca3b57b mangoapp: don't resize window if fps_only 2 years ago
Trigg dfad000928 - Unsaved change from XA_ATOM to XA_CARDINAL 2 years ago
trigg 661cb205e4 Add and remove XAtom in gamescope mode 2 years ago
FlightlessMango 17f3ebb7bd mangoapp: unused previous_pid variable 2 years ago
FlightlessMango 4eb6c83d81 mangoapp: disable checking vulkan layer for now 2 years ago
Alessandro Toia 32cd485568 Remove uppercase MANGOHUD_LOG_LEVEL strings 2 years ago
Alessandro Toia f0c3d123f5 Simplify MANGOHUD_LOG_LEVEL TO SPDLOG_LEVEL 2 years ago
Alessandro Toia 6e2e1d3967 Add check for valid log_level when using MANGOHUD_LOG_LEVEL 2 years ago
Alessandro Toia c27de42465 use MANGOHUD_LOG_LEVEL env var to control SPDLOG_LEVEL 2 years ago
Alessandro Toia 5b44ef7d07 Convert printf to spdlog 2 years ago
Alessandro Toia bab3529c74 If fps_only is enabled then disable legacy_layout 2 years ago
Alessandro Toia ce53794d5f Blacklist: add StarCitizen_Launcher.exe and InsurgencyEAC.exe 2 years ago
jackun 0916dadea6
Convert some "printfs" to spdlog 2 years ago
Alessandro Toia 22abf62b76 Disable fcat when full is present in conf file 2 years ago
Alessandro Toia 3f15f2322f Disable fcat when using MANGOHUD_CONFIG=full 2 years ago
jackun 27c9863119
Set initial client socket handle to "invalid" value 2 years ago
Alessandro Toia b699b16d2a gamepad: disable gamepad_battery_icon by default 2 years ago
jackun a8a0a245e6
Bump layer api version 2 years ago
jackun c19d37ab76
Temporary perma fix for vkQueueSubmit blocking on "used" semaphore when multiple swapchains are sent to vkQueuePresentKHR 2 years ago
jackun f680c28f1f
Generalize control over socket so it works with OpenGL too 2 years ago
PMunkes 6a010d8eab Introduce FCAT overlay support
This introduces support to overlay FCAT markers on top of other HUD elements.
For more information about nVidia's FCAT tool see: https://nvidia.com/en-us/geforce/technologies/fcat/technology
This patch includes support for the existing parameter infrastructure and it is fully dynamic.

Squashed commit:

Refactor FCAT to use existing parameter handling infrastructure

With this patch the FCAT overlay should be hooked up into the normal
parameter handling infrastructure. This includes support for
configuration file options, which are also part of this commit.
2 years ago
FlightlessMango f81369bd68 amdgpu: average gfx and cpu power as float 2 years ago
FlightlessMango 3184a44b96 Remove update_hw_info thread from log keybind 2 years ago
Alessandro Toia a18cabb152 Move gamepad_update to update_hw_info 2 years ago
jackun 39ba57daa1
s/is/are/g 2 years ago
jackun 8a628e6a77
Rename GL files to avoid some confusion with upstream Dear ImGui files 2 years ago
jackun 3e6b35560c
Use overlay_new/end_frame with mangoapp 2 years ago
FlightlessMango 1447778fd4 amdgpu: improve polling perf by reading with c
Co-authored-by: Martin Roukala <martin.roukala@mupuf.org>
2 years ago
FlightlessMango 10e17b3153 Use Hudelements params in logging 2 years ago
jackun b404fb948e
Set width by `table_columns` if not specified. Set "text" values to next column with `no_small_text` 2 years ago
jackun 753dd96325
Use overlay_new/end_frame to push/pop custom ImGui styles 2 years ago
jackun f78107e662
Wrap columns to new row depending on `table_columns` param 2 years ago
jackun 85db56b36b
[dbus] Skip rendering MPRIS info if locking fails
D-Bus code gets randomly stuck for some reason.
2 years ago
jackun f4cbb8b14b
When available (i.e. using vulkan), check vendor/device id and skip device if no match 2 years ago
jackun ac7c898ba7
Use uint32_t for device id etc 2 years ago
jackun d73932ad17
Clean up getAmdGpuInfo_actual 2 years ago
Alessandro Toia 9eb8447e14 Check if param gamepad_battery is enabled 2 years ago
FlightlessMango 3e57824f00 Fix zink detection from opengl path 2 years ago
FlightlessMango 5167e72649 gpu_metrics: send v1_0 to sysfs instead 2 years ago
jackun bd2f7b24b8
Snapshot some paths so moving stuff around doesn't randomly break things 2 years ago
FlightlessMango 17d4c1dd4a amdgpu: use gtt_used for APUs 2 years ago
FlightlessMango 19fbd9bf9b Nvidia: only do throttling checks if enabled 2 years ago
FlightlessMango 5d6ebe2f38 Logging: use same data for benchmark and summary 2 years ago
FlightlessMango 6119fa80d1 mangoapp: layer: remove unused get_device_chain_info func 2 years ago
FlightlessMango b30302c889 amdgpu: prefer hwmon over gpu_metrics for gpu temp
Co-authored-by: Martin Roukala <martin.roukala@mupuf.org>
2 years ago
FlightlessMango bcf16a0def amdgpu: fixed incorrect gpu load for centipercent
Co-authored-by: Martin Roukala <martin.roukala@mupuf.org>
2 years ago
jackun f0177703ea
Rename to `frame_count` for consistency 2 years ago
FlightlessMango ec5952d834 amdgpu: changed clocks to average 2 years ago
FlightlessMango 8b7a1995a9 amdgpu: fix cpu temp and watt 2 years ago
FlightlessMango f9cfdeb080 Add gpu throttling status
Co-authored-by: Martin Roukala <martin.roukala@mupuf.org>
2 years ago
FlightlessMango ae85730448 Improve amdgpu polling
Co-authored-by: Martin Roukala <martin.roukala@mupuf.org>
2 years ago
FlightlessMango 350dca5d21 Dynamic width when fps_only 2 years ago
jackun e4b23c937e
Deal with disappearing cpus
Reinit if cpu is brought offline/online, e.g. `echo 0 > /sys/devices/system/cpu/cpu1/online`

Fix #737
2 years ago
FlightlessMango 5349226fa5 amdgpu: average load over .5s 2 years ago
Alessandro Toia 06e3e9f663 Remove frametime when using fps_only param 2 years ago
FlightlessMango 4f9d870c72 fan: add some checks 2 years ago
FlightlessMango 66876b79f5 fix typo in fan element 2 years ago
FlightlessMango 65e70c9cfb fan param 2 years ago
jackun 425b98ae9a
[dbus] Fix trying to deinit non-active service(s)
Also, don't log with spdlog. It's already dead by then probably.
2 years ago
jackun 1f90b0b2aa
Revert "overlay: remove HUDElements.params setter"
This reverts commit 14ddc9563f.

HUDElements.params gets stale. Needs a proper fix though.
2 years ago
jackun 3ee1048acf Check if amdgpu gpu_metrics can be read and do some sanity-checks 2 years ago
Emil Velikov e50a969586
hud_elements: one assignment per line
Stay consistent with the rest of the project.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2 years ago
Emil Velikov 14ddc9563f
overlay: remove HUDElements.params setter
HUDElements.params is already set in the parse_overlay_config() call
before we even get here.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2 years ago
Emil Velikov 1dfb14da47
overlay_params: make parse_overlay_env() static
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2 years ago
Emil Velikov 6f85e388e5
overlay_params: mutate log_interval just after parsing
Currently we mutate the log_interval (if mangoapp is built), within the
logger itself. Move that to parse_overlay_config() where the actual
value is being parsed/set.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2 years ago
Emil Velikov 2b7db32f54
Const annotate overlay_params& across the board
Most of the API does not modify it, so annotate it as const.
This makes it earlier to reason what's happening.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2 years ago
Emil Velikov f8e9ecb9fe
overlay: remove unused calculate_benchmark_data() declaration
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2 years ago
Emil Velikov 9639377694
overlay: annotate render_benchmark() as static
Function is used solely within the compilation unit.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2 years ago
Emil Velikov 5a53ad010f
overlay: position_layer() takes an immutable window_size
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2 years ago
Emil Velikov 1e840f286b
mangohud: initialize the window_size
This one seems janky - other frontends (glx/egl LD_PRELOAD, Vulkan)
init their own global window_size.

Although in reality we use the initial data solely to set the imgui
"window" position and we immediatelly overwrite it, with the follow-up
call render_imgui().

Odds are this won't fix the glitchy (re)sizes but it's a step in the
right direction.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2 years ago
Emil Velikov 74e83c0bba
mangoapp: iconify/restore the window, don't destroy it
Currently we're destroying the window, from under the glfw's framework
feet.

Basically we do a use-after-free, as glfwWindowShouldClose() is called
and due to some miracle we don't crash out.

Since we suspend all rendering, there's no need to actually destroy the
window - just iconify/restore it. A simple show/hide was attempted but
empirically did not work.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2 years ago
Emil Velikov 40a1758518
mangoapp: reuse shutdown() helper
Use the helper across the board, instead of open-coding it.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2 years ago
Emil Velikov fc7a426d67
mangoapp: explicitly handle 0 over the protocol
Receiving 0 indicates no-op/keep as-is. Add a trivial self-describing
two-liner.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2 years ago
Emil Velikov f2b991cccd
mangoapp: make internal function static
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2 years ago
Emil Velikov 8482ca00fa
mangoapp: make mangoapp_paused, msgid static
Both variables are used within the app alone - make them static to that
unit.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2 years ago
Emil Velikov 403b0f2154
mangoapp: remove unused ctrl_msgid
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2 years ago
Emil Velikov 5400332d5a
mangoapp: whitespace fixes
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2 years ago
Emil Velikov 5e53342f6c
mangohudctl: rework argv handling, always send valid data
Currently, if the user sets attribute we send dummy data to mangohud.
Avoid that by pulling the attrib handling into main and avoiding the
duplicate attribute name checking.

Kill off the no-longer relevant TODO while we're here.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2 years ago
jackun f4ea65429e
No frame time for first frame
We don't know when it started to render, so...
2 years ago
jackun a13b041d1d
Fps limit: simplify converting frame time back to fps 2 years ago
jackun d2d6787568
Cleanup some header inclusions 2 years ago
jackun 45113bb7d2
Specify `fileChanged` argument type 2 years ago
jackun 73da29d4ad
Try to init spdlog a bit earlier 2 years ago
jackun 2f5efc320a
Move FpsLimiter to overlay.cpp 2 years ago
jackun a26e6325cc
[dbus] Use GameMode portal inside flatpak 2 years ago
jackun bac50e42d5 Add frame count 2 years ago
FlightlessMango 3f92e10c14 mangoapp: fix broken fsr sharpness 2 years ago
FlightlessMango e6adae8489 mangoapp: fixing some warnings 2 years ago
FlightlessMango 284ae0da2c mangoapp: layer: remove unused functions 2 years ago
FlightlessMango 4341843117 nlohmann_json wrap 2 years ago
FlightlessMango 7df8918c42 mangoapp: layer: append libdir to json 2 years ago
jackun 11142b5b2c
Merge pull request #703 from evelikov/misc-mixes
Remove libdrm_amdgpu and other unnecessary code
2 years ago