22abf62b76
Disable fcat when full is present in conf file
2 years ago
3f15f2322f
Disable fcat when using MANGOHUD_CONFIG=full
2 years ago
27c9863119
Set initial client socket handle to "invalid" value
2 years ago
b699b16d2a
gamepad: disable gamepad_battery_icon by default
2 years ago
a8a0a245e6
Bump layer api version
2 years ago
c19d37ab76
Temporary perma fix for vkQueueSubmit blocking on "used" semaphore when multiple swapchains are sent to vkQueuePresentKHR
2 years ago
f680c28f1f
Generalize control over socket so it works with OpenGL too
2 years ago
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
f81369bd68
amdgpu: average gfx and cpu power as float
2 years ago
3184a44b96
Remove update_hw_info thread from log keybind
2 years ago
a18cabb152
Move gamepad_update to update_hw_info
2 years ago
39ba57daa1
s/is/are/g
2 years ago
8a628e6a77
Rename GL files to avoid some confusion with upstream Dear ImGui files
2 years ago
3e6b35560c
Use overlay_new/end_frame with mangoapp
2 years ago
1447778fd4
amdgpu: improve polling perf by reading with c
...
Co-authored-by: Martin Roukala <martin.roukala@mupuf.org>
2 years ago
10e17b3153
Use Hudelements params in logging
2 years ago
b404fb948e
Set width by `table_columns` if not specified. Set "text" values to next column with `no_small_text`
2 years ago
753dd96325
Use overlay_new/end_frame to push/pop custom ImGui styles
2 years ago
f78107e662
Wrap columns to new row depending on `table_columns` param
2 years ago
85db56b36b
[dbus] Skip rendering MPRIS info if locking fails
...
D-Bus code gets randomly stuck for some reason.
2 years ago
f4cbb8b14b
When available (i.e. using vulkan), check vendor/device id and skip device if no match
2 years ago
ac7c898ba7
Use uint32_t for device id etc
2 years ago
d73932ad17
Clean up getAmdGpuInfo_actual
2 years ago
9eb8447e14
Check if param gamepad_battery is enabled
2 years ago
3e57824f00
Fix zink detection from opengl path
2 years ago
5167e72649
gpu_metrics: send v1_0 to sysfs instead
2 years ago
bd2f7b24b8
Snapshot some paths so moving stuff around doesn't randomly break things
2 years ago
17d4c1dd4a
amdgpu: use gtt_used for APUs
2 years ago
19fbd9bf9b
Nvidia: only do throttling checks if enabled
2 years ago
5d6ebe2f38
Logging: use same data for benchmark and summary
2 years ago
6119fa80d1
mangoapp: layer: remove unused get_device_chain_info func
2 years ago
b30302c889
amdgpu: prefer hwmon over gpu_metrics for gpu temp
...
Co-authored-by: Martin Roukala <martin.roukala@mupuf.org>
2 years ago
bcf16a0def
amdgpu: fixed incorrect gpu load for centipercent
...
Co-authored-by: Martin Roukala <martin.roukala@mupuf.org>
2 years ago
f0177703ea
Rename to `frame_count` for consistency
2 years ago
ec5952d834
amdgpu: changed clocks to average
2 years ago
8b7a1995a9
amdgpu: fix cpu temp and watt
2 years ago
f9cfdeb080
Add gpu throttling status
...
Co-authored-by: Martin Roukala <martin.roukala@mupuf.org>
2 years ago
ae85730448
Improve amdgpu polling
...
Co-authored-by: Martin Roukala <martin.roukala@mupuf.org>
2 years ago
350dca5d21
Dynamic width when fps_only
2 years ago
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
5349226fa5
amdgpu: average load over .5s
2 years ago
06e3e9f663
Remove frametime when using fps_only param
2 years ago
4f9d870c72
fan: add some checks
2 years ago
66876b79f5
fix typo in fan element
2 years ago
65e70c9cfb
fan param
2 years ago
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
1f90b0b2aa
Revert "overlay: remove HUDElements.params setter"
...
This reverts commit 14ddc9563f
2 years ago
3ee1048acf
Check if amdgpu gpu_metrics can be read and do some sanity-checks
2 years ago
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
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
1dfb14da47
overlay_params: make parse_overlay_env() static
...
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2 years ago
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
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
f8e9ecb9fe
overlay: remove unused calculate_benchmark_data() declaration
...
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2 years ago
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
5a53ad010f
overlay: position_layer() takes an immutable window_size
...
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2 years ago
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
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
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
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
f2b991cccd
mangoapp: make internal function static
...
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2 years ago
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
403b0f2154
mangoapp: remove unused ctrl_msgid
...
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2 years ago
5400332d5a
mangoapp: whitespace fixes
...
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2 years ago
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
f4ea65429e
No frame time for first frame
...
We don't know when it started to render, so...
2 years ago
a13b041d1d
Fps limit: simplify converting frame time back to fps
2 years ago
d2d6787568
Cleanup some header inclusions
2 years ago
45113bb7d2
Specify `fileChanged` argument type
2 years ago
73da29d4ad
Try to init spdlog a bit earlier
2 years ago
2f5efc320a
Move FpsLimiter to overlay.cpp
2 years ago
a26e6325cc
[dbus] Use GameMode portal inside flatpak
2 years ago
bac50e42d5
Add frame count
2 years ago
3f92e10c14
mangoapp: fix broken fsr sharpness
2 years ago
e6adae8489
mangoapp: fixing some warnings
2 years ago
284ae0da2c
mangoapp: layer: remove unused functions
2 years ago
4341843117
nlohmann_json wrap
2 years ago
7df8918c42
mangoapp: layer: append libdir to json
2 years ago
11142b5b2c
Merge pull request #703 from evelikov/misc-mixes
...
Remove libdrm_amdgpu and other unnecessary code
2 years ago
d4064bf6b7
mangoapp: layer: remove unused stuff
2 years ago
b064f47d66
mangoapp: vulkan layer
2 years ago
5b1bda770a
mangoapp: remove debug stuff
2 years ago
1940a83566
mangoapp: don't assume APU for temps
2 years ago
816d9f6b98
overlay: rework misleading gpu_busy_percent check
...
Above all, we really don't need the gpu_busy_percent node, if the GPU
exposes a gpu_metrics node,
Although looking closer, the gpu_busy_percent check is meant for
something else - to distinguish between the card node (cardX) and the
card output node (cardX-output-foo).
To top it all up, the check at the very end implies that we can get a
case where gpu_metrics and gpu_busy_perfect is missing ... that's not
possible.
So instead, drop the early gpu_busy_perfect check and properly mandate
it later on.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2 years ago
9c6de0271f
overlay: completely remove force_amdgpu_hwmon option
...
No longer applicable, since the libdrm path is gone and hwmon is
required - either partially or in full.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2 years ago
17bfd6ed08
Skip the standalone nodes, when gpu_metrics is present
...
Currently we open the standalone busy, temp, gpu/memory clock and
power_usage nodes, even if gpu_metrics is present.
At the same time, we correctly ignore them when doing the read-only.
So just avoid opening them all together.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2 years ago
5143229bd1
Fix gpu_stats logic check
...
Currently we can get the load and temp stats either from the standalone
nodes or from the gpu_metrics (binary) sysfs node.
Fix the next to handle that.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2 years ago
a7e8ae9417
Remove dummy vendorID overwrite in init_gpu_stats()
...
We have already enforced that a few lines above just after parsing the
vendor node.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2 years ago
2aa49caf52
Remove find_folder() API
...
Can be trivially replaced with ls()
v2: Move break where it's supposed to.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2 years ago
d75b4d972b
Remove unused LS_FLAGS::LS_ALL
...
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2 years ago
ffb9b592f5
Use a switch in ls() d_type handling
...
Makes the code much easier to read.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2 years ago
ab684a2f24
List regular files with ls(.. LS_FILES)
...
Currently it can give you a regular file, block/char device, fifo or a
socket.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2 years ago
68ce8f81cc
Remove libdrm_amdgpu metrics
...
There are two alternatives - hwmon entries and gpu_metrics sysfs file.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2 years ago
abbe5233ee
Remove unused X11/drm auth code
...
The code was added back in 2020 and seemingly never built. Just drop it
- if needed it can be git reverted at some point.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2 years ago
7ad24b4c0a
Simplify cpu/mem/os/glxinfo parsing
...
Currently we pipeline a bunch of commands alike cat | grep | sed, there
we can do all that job with a single sed invocation - use that.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2 years ago
83ce3ace2d
keybinds: move ifdef spaghetti into the header
...
Drop the ifdef and simplify the .cpp file.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2 years ago
8b801e8435
don't set hide_fsr_sharpness with full
2 years ago
0402fa4ab5
mangoapp: fsr_steam_sharpness
2 years ago
5c984e7b80
mangoapp: fsr_steam_sharpness
2 years ago
b1fdbc3a5b
Disable gamemode dbus for now
2 years ago
822bb66629
Fix confusing vendorID with deviceID
...
OpenGL still needs some work to select the actual render device >:(
2 years ago
8e21b52acf
Make `get_device_name` return GPU name
2 years ago
c88ef84bf5
Revert "Get device name before system info"
...
This reverts commit e7de7b5b93
2 years ago
8af07b4945
Move `logging()` to Logger struct
...
Stopgap to use same m_params while waiting for proper multithreading-safe overlay_params fix.
2 years ago
42de1edc22
Rework cpu freq node handling
...
Similar to the prior commit - fscanf directly into the required data
type.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2 years ago
597f78cbee
Fixup device/vendor node handling
...
Currently we readout the data as string only to convert it to hex. In
the error case, we leak the fd for the given nodes.
Read the data as hex directly, error out if that fails and avoid the
leaks.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2 years ago
e3de89e475
Couple of whitespace fixes
...
Automatically picked by my editor, while fixing the warnings with prior
commits.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2 years ago
c5748a3154
Reorder Logger() constructor args
...
Currently the order varies across the struct and constructor. As a nice
reminder GCC will throw a lovely warning at us. Fix the ordering.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2 years ago
30cfe839eb
Address signed comparisons warnings
...
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2 years ago
8ac81477d9
Remove unused parseConfigFile() return type
...
Was briefly introduced a while ago and the only user was been dropped
since then.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2 years ago
dc53cbf0f0
Remove unused-but-set variables
...
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
2 years ago
3f2db318c5
Some fixes for windows compiling
2 years ago
ae7c5f0f24
Fix hud benchmark
2 years ago
9b668babdc
gamepad: add bool is_charging
2 years ago
6db23968ee
gamepad: fix 8Bitdo counter
2 years ago
74b328d209
gamepad: add option to disable icon and show capacity instead
2 years ago
5c92c32491
add gamepad_battery to legacy elements
2 years ago
7d90ef8169
GAMEPAD: add 8Bitdo support
2 years ago
a484f32e57
GAMEPAD: remove unsed variables
2 years ago
a8ab4e2991
GAMEPAD: remove unused param and change xone to xbox
2 years ago
4be3ba20c2
GAMEPAD: add battery reporting for gamepad devices
...
(xone,xpadneo,ds4,ds5,switch)
2 years ago
a029dfaaf2
Don't hide gpu_metrics behind HAVE_LIBDRM_AMDGPU
2 years ago
93f389dd62
clean up frametime_data
2 years ago
3a667ab66b
Revert FPS calc
2 years ago
cf8ba8fd63
mangoapp: clean up msg_size
2 years ago
d82738b03c
mangoapp: use GAMESCOPE_FOCUSED_APP_GFX instead
2 years ago
68f40c56cc
only shrink frametime graph on mangoapp
2 years ago
e555a942fb
Use single IO stats instance
2 years ago
e12042ca3d
mangoapp: adjust for changed msg size in gamescope
2 years ago
fa133940c8
Fix min/max frametime
2 years ago
fb97530965
cpu: Fix not reporting amd cpu power
2 years ago
e289a55c6f
mangoapp: make sure steam_focused is false when mangoapp_steam
2 years ago
316914da8d
mangoapp: fixed mangoapp not respecting no_display
2 years ago
5cdedc4671
mangoapp: gamescope debug graphs
2 years ago
4608fa5e3a
vkGetInstanceProcAddr(instance, "vkGetInstanceProcAddr") should return our vkGetInstanceProcAddr not the next in the chain.
2 years ago
7740e8430f
mangoapp: clean up unused variable
2 years ago
44a335a809
mangoapp: mangoapp_steam bool
2 years ago
6521eaa82d
mangoapp: hide hud by default
2 years ago
056f7b0e29
Check if battery status is full
2 years ago
17867f2a6d
Battery: show remaining if > 1.f
2 years ago
b11714a326
mangoapp: hide fsr sharp when off
2 years ago
339f5c0d11
mangoapp: hide when steam is focused
2 years ago
cdcd08be44
battery remaining: don't show seconds at least by default
2 years ago
5508933c47
mangoapp: make fsr display a little prettier
2 years ago
590f52d223
When battery is plugged in show plug icon
2 years ago
30ee0b770d
Don't use all sysfs files if metrics_path
2 years ago
c708b1a8a8
disable deviceid check for now
2 years ago
4556caf6d3
mangoapp: remove some debug
2 years ago
b598d22543
mangoapp: don't write imgui.ini
2 years ago
b158888d54
Add remaining time text to battery
2 years ago
61fb9267a0
mangoapp: don't use fsr if msg doesn't contain fsr
2 years ago
39f6ae98ec
Battery remaining time
2 years ago
a9f811a207
mangoapp: gamescope fsr
2 years ago
8ddbcc3803
don't average log fps
2 years ago
d71dd74685
Fix amdgpu watt and make it more granular
2 years ago
a76f2a9677
Merge pull request #684 from Joshua-Ashton/no_display_default_mapp
...
Enable no_overlay by default with mangoapp
2 years ago
5373140341
Don't enable battery_icon with full
2 years ago
d72099d1e7
Fixed issue with amdgpu metrics for APU
2 years ago
beecde110b
Enable no_overlay by default with mangoapp
...
Don't want this displaying unless explicitly requested.
2 years ago
986f3cc1b3
gpu_metrics: apu: set cpu temp as highest core temp
2 years ago
6983c2ec39
Use gpu_metrics instead of libdrm when available
2 years ago
eefce24024
Log an error if `nvmlDeviceGetUtilizationRates` failed
2 years ago
8bc979b53c
mangoapp: Fix janky window size transitions
...
GL apps that use non-normalized coordinates for stuff that will probably do stuff like this a lot in ways that make it hard to precompute the values beforehand make me very upset.
2 years ago
b99817fd2b
mangoapp: Don't redraw if we don't have new frames
2 years ago
da8b0cbad4
mangoapp: Fix usage of notify_one in condition variable
...
This should be outside of the lock_guard scope to avoid a deadlock.
2 years ago
8e2c7e8524
mangoapp: disable amdgpu_handles
2 years ago
4943129844
cpu: Add parentheses around assigment in if check
2 years ago
ed4c8bca80
logging: Initialize total, total_cpu, total_gpu variables
2 years ago
e0cee5dbe3
cpu: Remove unused _power variable
2 years ago
fb1cae9cc9
display min/max frametime for period
2 years ago
e435764eff
Merge pull request #662 from nanokatze/master
...
Set VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT when creating swapchain
2 years ago
9c15d093d6
Only reset logger if param is not set
2 years ago
639c39cdbb
mangohudctl: expand help message
2 years ago
15a5edeb51
mangoapp: fixing up ctl switch statements
2 years ago
c50c815630
destroy logger with vulkan instance
2 years ago
af716ac830
Add fps_only to legacy_elements, fixes #674
2 years ago
46730b572a
permit starting a new log even if previous is rendering
2 years ago
9c7f91eccd
clearer headers in summary
2 years ago
e9d4eeff04
mangohudctl meson option
2 years ago
97f6a00171
mangohudctl and interface
2 years ago
f462c7ff76
Write log file in mangoapp
...
This was only writing the summary, which is rather useless.
2 years ago
3e2023a4a2
mangoapp: control socket
2 years ago
d4ca1050ec
control: add toggle-logging
2 years ago
d734fa1b66
mangoapp: set static height to include benchmark
2 years ago
2455d7ae9e
Disable fps_color_change and core_load_change when using full config
2 years ago
0f49c5796a
Merge pull request #671 from Joshua-Ashton/empty_crash
...
Fix crash when no frames were recorded
2 years ago
437563fa77
Fix crash when no frames were recorded
...
This can happen with MangoApp + the Steam Deck UI as it doesn't commit when there is nothing going on
2 years ago
3d3916247a
mangoapp: force benchmark underneath
2 years ago
8ee7dc0d7b
mangoapp: increase window size when rendering benchmark
2 years ago
53b2a8b842
mangoapp: force log_interval 0
2 years ago
21ecb48214
Fix fps not showing when using full config
2 years ago
6f882115f0
initialize m_log_end
2 years ago
1f94e0af4d
Merge pull request #657 from ishitatsuyuki/quad
...
overlay: avoid quadratic behavior
2 years ago
5d3c0ff686
mangoapp: make sure logger is inited
2 years ago
d5c409beed
mangoapp: temporarily remove vram mhz
2 years ago
37e18279e7
mangoapp: use amdgpu metrics
2 years ago
498687c33d
mangoapp: let gamescope decide when to send updates
3 years ago
f7dffb03a1
mangoapp: bump width
3 years ago
77e4d51d87
calculate and show mins in benchmark
3 years ago
3366120364
Move calc benchmark into logger
3 years ago
Alessandro Toia
jackun
PMunkes
FlightlessMango
Emil Velikov
flightlessmango
Joshua Ashton
Lukáš Horáček