Commit Graph

775 Commits

Author SHA1 Message Date
jackun
a52dce875f
[OpenGL] Keep glClipControl local to imgui_impl_opengl3.cpp 2020-03-13 16:08:36 +02:00
jackun
05d61ee77e
Init CPUStats just once 2020-03-13 16:08:36 +02:00
FlightlessMango
e68dd48f3f forgot one refresh_config 2020-03-13 15:07:44 +01:00
FlightlessMango
fe69ec2955 changed refresh_config to reload_cfg 2020-03-13 14:57:11 +01:00
FlightlessMango
501d7d74d2 install example config with meson 2020-03-13 12:41:22 +01:00
jackun
5caeb10882
[OpenGL] Apply swap interval from glXMakeCurrent 2020-03-13 10:05:41 +02:00
jackun
297b44bfe6
[OpenGL] Force-load libGL.so.1 with dlopen() if dlsym fails to find functions 2020-03-13 09:35:14 +02:00
jackun
e0ce0493f7
[OpenGL] Set swap interval (vsync) with gl_vsync param 2020-03-12 12:12:21 +02:00
FlightlessMango
8133048e9c Add blank configuration for project_name and layer_suffix with build.sh 2020-03-12 09:20:22 +01:00
FlightlessMango
8153e29eb3 forgot to add '/' to end of path 2020-03-12 08:31:33 +01:00
FlightlessMango
8599484032 configure .json files with meson 2020-03-12 08:24:37 +01:00
jackun
37e34335ae
Sprinkle NDEBUG over gl debug prints 2020-03-11 18:57:21 +02:00
jackun
ad598f7ec4
[OpenGL] Fix double-free with ImGui context 2020-03-11 18:56:31 +02:00
jackun
f99129f9de
Libdirs: once more, with feeling 2020-03-11 18:11:35 +02:00
jackun
4761078133
Fix small font for gl 2020-03-11 12:23:39 +02:00
jackun
c88b930a37
Match gl PushPopStyle count with vulkan's 2020-03-11 12:16:53 +02:00
jackun
bc7db582bd
Single ImGui context for OpenGL
Seems only VAO is not shareable between OpenGL context
but that gets recreated every render anyway.
2020-03-11 12:15:44 +02:00
jackun
373bba5fcf
Keep time outside the table or it gets clipped if using too fancy a format 2020-03-11 12:11:16 +02:00
FlightlessMango
8bf8723ad5 added param text_color 2020-03-11 06:20:18 +01:00
FlightlessMango
77b3033cc7 Removed frametime_alpha and replace it with an overall alpha for text and frametime 2020-03-11 06:07:41 +01:00
FlightlessMango
a1eafc3403 Install .so into subdirectory in libdir 2020-03-11 05:19:48 +01:00
jackun
a64b6cada2
Build/install scripts: verbose tar output and set files' owner/group to root 2020-03-10 23:41:55 +02:00
FlightlessMango
8558d038d7 refactored the install process 2020-03-10 13:39:52 +01:00
FlightlessMango
ccf870e630 changed offset_x/y to int so it can be negative 2020-03-10 10:18:59 +01:00
FlightlessMango
88ad5de2ab Fix so preloading doesn't break vulkan layer 2020-03-10 08:27:27 +01:00
FlightlessMango
163c76bea7 added param background_color 2020-03-10 07:48:04 +01:00
FlightlessMango
28e765a6a3 added param frametime_alpha 2020-03-10 07:27:28 +01:00
FlightlessMango
906a8cde23 added param frametime_color 2020-03-10 06:30:37 +01:00
FlightlessMango
a2735693ba Merge opengl into develop 2020-03-10 06:19:18 +01:00
FlightlessMango
755558ecb9 added param io_color 2020-03-10 05:01:31 +01:00
FlightlessMango
d8b3c3c81f params for changing color of cpu, gpu, vram, ram and engine text 2020-03-10 04:51:27 +01:00
jackun
5e4bd7b8c8
Keep time outside the table or it gets clipped if using too fancy a format 2020-03-07 14:10:52 +02:00
jackun
b4f1402461 Right align value texts 2020-03-07 02:08:01 +01:00
jackun
e881a1538a Pre-convert crosshair's color to ImGui's format 2020-03-07 02:08:01 +01:00
jackun
1a8b98e09d Divide memory sizes by 1024 byte chunks 2020-03-07 02:08:01 +01:00
FlightlessMango
857dcf7fb8 use hmwon freq1/2 instead for amdgpu core/mem clocks 2020-03-07 02:08:01 +01:00
FlightlessMango
274b3e67ca don't extend hud width if gpu_stats is disabled 2020-03-07 02:08:01 +01:00
FlightlessMango
4d5f62386b added gpu mem and core clocks to hud 2020-03-07 02:08:01 +01:00
jackun
f8398c3e7a Add I/O stats
Using /proc/self/io 'read_bytes' and 'write_bytes' fields which count only
reads/writes that hit the storage (i.e no cached reads).
2020-03-07 02:07:24 +01:00
FlightlessMango
534ca9416d Spruced up iostats and change to bool from custom 2020-03-07 02:06:40 +01:00
FlightlessMango
4847cb8e31 Using table for hud layout 2020-03-07 02:06:40 +01:00
jackun
2472e69205
Check if pApplicationInfo is null 2020-03-07 02:29:31 +02:00
jackun
ea8f0ad666
Includes cleanup 2020-03-06 23:07:28 +02:00
jackun
fad35b9540
Just check hwmon sysfs folder for cpu temp sensors 2020-03-05 09:52:14 +02:00
jackun
6bf37f8510
Add "time_format" parameter; update time string every "fps_sampling_period" interval
See std::put_time docs for supported formatting
2020-03-02 22:53:43 +02:00
jackun
9a4c9033fa
Support escaping delimiters in MANGOHUD_CONFIG 2020-03-02 22:53:42 +02:00
jackun
417b1aac8d
config: trim only surrounding whitespace 2020-03-02 22:53:29 +02:00
FlightlessMango
58c7831d5c hud width correction 2020-02-29 01:38:40 +01:00
FlightlessMango
80cff1ac86 Fixed hud width not applying 2020-02-29 01:16:41 +01:00
FlightlessMango
12ba4f9ea5 No need to set hud height manually anymore 2020-02-28 22:01:04 +01:00
jackun
8a348ffbf0
Disable gpu_timing for now
Issue #44
2020-02-20 23:08:09 +02:00
jackun
b91be85ff9
Use std::unordered_map and std::mutex instead for object mapping and related cleanups 2020-02-20 01:03:35 +02:00
jackun
54950853b5
Remove redundant 'no_display' code 2020-02-18 15:36:20 +02:00
jackun
d78622a322
Don't enable 'read_cfg' too when 'full' is set in MANGOHUD_CONFIG
Could use OVERLAY_PARAM_INTERNAL or something similar but currently
less code to just save the boolean and reset.
2020-02-18 15:13:22 +02:00
jackun
8f66bd7d87
Set stats window height to ImGui::GetCursorPosY() 2020-02-18 14:35:58 +02:00
jackun
2fb0453e28
Create ImGui fonts per swapchain 2020-02-18 14:21:22 +02:00
FlightlessMango
099082affc Refresh config keybind 2020-02-18 12:04:59 +01:00
FlightlessMango
7593582f4a Fixed parsing crosshair color function 2020-02-18 11:44:45 +01:00
jackun
9053b63142
Allocate instance_data with "new" 2020-02-18 11:49:09 +02:00
jackun
68e880a101
config: rename param to "read_cfg" 2020-02-18 11:47:58 +02:00
jackun
ad2ed4a99a
config: load highest priority config available only 2020-02-18 09:32:45 +02:00
jackun
80f29aad9d
Allow MANGOHUD_CONFIG to override configuration files' settings.
Use `MANGOHUD_CONFIG=some_setting=1` to skip reading the configuration files
and just use the settings specified with MANGOHUD_CONFIG.

Use `MANGOHUD_CONFIG=read_configs,...` to read configuration files too and
add other settings that you would like to override.
2020-02-18 09:24:22 +02:00
jackun
f7e7146883
config: find_last_of can search for multiple characters, doh 2020-02-18 00:59:56 +02:00
jackun
6a45ac84b3
config: sometimes wine exe has forward-slashes instead 2020-02-17 13:52:10 +02:00
jackun
65b90fc01b
config file: respect XDG dirs
Other half of #37
2020-02-15 13:23:18 +02:00
jackun
67eab673d8
Override previous setting, std::unordered_map::insert() does not. 2020-02-14 08:45:22 +02:00
jackun
70d0e81c36
Clone vulkan headers if needed 2020-02-13 23:53:56 +02:00
Danilo Spinella
18edd4eb50 meson: Add option to use system vulkan headers 2020-02-13 21:47:50 +02:00
jackun
5c4816efa5
Unused instance_data 2020-02-13 20:54:17 +02:00
jackun
69cf83d3bc
config file: print that config file is skipped if we failed to open it 2020-02-13 15:19:42 +02:00
jackun
3e0eda559d
print if done parsing config file 2020-02-13 13:48:29 +02:00
jackun
6086a6b9ab
config file: try to detect Wine executable's path 2020-02-13 13:45:33 +02:00
jackun
169d5ff99a
Search configs in ~/.config/MangoHud 2020-02-12 23:10:19 +02:00
jackun
08debe5d09
Add per-executable config file support
* executable's name + ".conf" in config dir
* "MangoHud.conf" in executable's folder
2020-02-12 23:00:33 +02:00
jackun
90a93fd2fc
Add "get executable's path" function 2020-02-12 22:59:00 +02:00
jackun
74c9803087
config file: if parameter line has no equal sign, default value to 1 2020-02-12 22:27:00 +02:00
jackun
27848bd253
Don't crash if there's nothing to draw 2020-02-12 19:58:01 +02:00
FlightlessMango
d8783d3002 Added time param 2020-02-12 18:24:00 +01:00
FlightlessMango
29bacea97f Add param option full 2020-02-12 16:52:54 +01:00
jackun
b9ae979a05
Don't interpolate fps limit sleep overhead
Random hiccups and game pauses can make it go crazy otherwise.
2020-02-12 13:58:13 +02:00
FlightlessMango
dba31e6a11 Set background alpha color to 1.0 2020-02-12 12:43:46 +01:00
FlightlessMango
e947dae9ed Fixed fps limiter accuracy 2020-02-12 05:59:18 +01:00
FlightlessMango
c73df54166 Added background_alpha param 2020-02-12 04:51:08 +01:00
jackun
60763420eb
Use defines instead of magic numbers for HUD hotkeys' 2020-02-11 21:50:29 +02:00
FlightlessMango
e81fa5776e Added crosshair_color param 2020-02-11 09:21:23 +01:00
FlightlessMango
d79d06271f Repurposed no_display param 2020-02-11 06:10:10 +01:00
FlightlessMango
50cff923e8 Changed vram to display GB from MB 2020-02-11 02:50:33 +01:00
FlightlessMango
3c4fcda623 Added offset x/y in params 2020-02-10 17:37:37 +01:00
FlightlessMango
2590426ef6 Merge branch 'config' 2020-02-10 17:13:45 +01:00
FlightlessMango
a8e4ac84f9 Merge branch 'crosshair' 2020-02-10 17:08:15 +01:00
FlightlessMango
69ed9db4c1 Merge branch 'limiter' 2020-02-10 17:01:03 +01:00
FlightlessMango
f56c53c152 Removed unused header 2020-02-10 16:59:49 +01:00
FlightlessMango
2003ae93c9 Continue parsing overlay params without env 2020-02-10 14:57:22 +01:00
jackun
1fc94f6db5
Remove unused histogram's get_stat() 2020-02-10 12:42:44 +02:00
Georg Lehmann
7a4ffe8206
Vulkan overlay: use the corresponding image index for each swapchain
pImageIndices should be a pointer to the current image index
otherwise every swapchain but the first one could have a wrong image index
2020-02-10 12:38:05 +02:00
jackun
b2f20f02d2
Prefix check links too 2020-02-10 12:37:24 +02:00
FlightlessMango
5a62a1b0de Cleaning up 2020-02-10 11:03:39 +01:00
FlightlessMango
33f48c91be Apply params from config file 2020-02-10 10:32:22 +01:00
FlightlessMango
ebc49ae8c5 Basic parse config 2020-02-10 09:37:19 +01:00
FlightlessMango
d578d612d4 Renamed overlay_param.c to .cpp 2020-02-09 14:02:40 +01:00
FlightlessMango
47f293a722 Change param keybind vars to KeySym 2020-02-09 12:26:56 +01:00
FlightlessMango
784cb427ff Use params for keybinds 2020-02-09 12:26:41 +01:00
FlightlessMango
25f4c88175 Change param keybind vars to KeySym 2020-02-09 12:26:19 +01:00
FlightlessMango
e5341dd86b Use params for keybinds 2020-02-09 12:25:23 +01:00
FlightlessMango
9d8fbe561d Keybind params for toggle hud and log 2020-02-09 12:13:54 +01:00
FlightlessMango
1a523a735f Keybind params for toggle hud and log 2020-02-09 12:10:41 +01:00
FlightlessMango
e359058430 Fixed hud being wider than intended 2020-02-09 09:25:00 +01:00
jackun
5f6c3c9190
Fix ImGui::PopStyleColor() being in wrong place 2020-02-08 20:32:33 +02:00
FlightlessMango
c5ea98a243 Added a crosshair and params for it 2020-02-08 03:55:39 +01:00
FlightlessMango
be8dc8929d Don't use fps limiter unless limit is set 2020-02-08 01:59:26 +01:00
FlightlessMango
148d19422d Added vsync option 2020-02-07 13:12:58 +01:00
FlightlessMango
cd131e0c39 Add fps_limit param 2020-02-07 12:14:59 +01:00
FlightlessMango
a99720f311 Change to nanoseconds 2020-02-07 12:01:20 +01:00
FlightlessMango
f38389b967 FPS limiter 2020-02-07 11:46:12 +01:00
FlightlessMango
4be6d4c748 Added frametime ms next to frametime graph 2020-02-07 00:00:40 +01:00
FlightlessMango
bd4c402824 Added Frametime label 2020-02-06 23:58:45 +01:00
FlightlessMango
c6d7fdd110 Fixed some issue with calculating hud height 2020-02-06 23:57:32 +01:00
telans
1bc513f572
remove nvidiaSmiThread 2020-02-06 18:45:32 +13:00
jackun
97fcafd030
Check if amdgpu file handles are valid 2020-02-05 22:37:03 +02:00
Georg Lehmann
908d46d6ea
Correctly wait in the fragment stage until all semaphores are signaled
This fixes two issues:
- a crash if the application uses more than one semaphore for presenting because the driver expects one stage per semaphore
- the swapchain image could be not ready yet if the semaphores aren't signaled, \#946[1] is possible related

[1] https://gitlab.freedesktop.org/mesa/mesa/issues/946

Signed-off-by: jackun <jack.un@gmail.com>
2020-02-05 22:37:03 +02:00
jackun
3c8376588a
Init gpu stats when VkDevice gets created 2020-02-05 22:37:03 +02:00
FlightlessMango
1e475ac02c removed unused nvctrl 2020-02-05 13:23:08 +01:00
jackun
46d8a03b50
Use PRId64 for int64_t string format 2020-02-05 14:19:16 +02:00
FlightlessMango
36eba167d8
use nvml for nvidia gpu memory instead of nvctrl 2020-02-05 14:16:16 +02:00
FlightlessMango
35d8f7c829
add ram/vram param options 2020-02-05 14:16:16 +02:00
FlightlessMango
beaac191d1
Displaying used ram and vram on the hud 2020-02-05 14:16:16 +02:00
FlightlessMango
6affdb8c51
fetch nvidia vram used from nvctrl 2020-02-05 14:16:16 +02:00
FlightlessMango
23280e0e78
fetching vram for amd gpus 2020-02-05 14:16:16 +02:00
FlightlessMango
d97719e3d6
get nvidia vram from nvml 2020-02-05 14:16:16 +02:00
FlightlessMango
5201a26d95
detach memory thread when done 2020-02-05 14:16:15 +02:00
FlightlessMango
e3b380b970
changed mem color 2020-02-05 14:16:15 +02:00
FlightlessMango
14ad1e015a
Display memory stats on the hud 2020-02-05 14:16:15 +02:00
FlightlessMango
8ab7cd0f20
Basic memory fetching 2020-02-05 14:16:06 +02:00
FlightlessMango
d20a92a0c4 Write system info to log file 2020-02-05 07:07:23 +01:00
FlightlessMango
68599a02a3 param options for cpu_stats and gpu_stats 2020-02-05 01:06:10 +01:00
jackun
bba8702ff3
Check if engine name is set 2020-02-05 00:43:32 +02:00
jackun
bf45bd9a02
Don't increment cpuData index inline 2020-02-04 23:33:36 +02:00
jackun
6d3d869586
Fix system info and stats parsing 2020-02-04 23:23:01 +02:00
jackun
217b65f0e9
Some cpu/gpu stats parsing fixes 2020-02-04 23:23:01 +02:00
jackun
b5bfd437a6
Add file and string utility functions 2020-02-04 23:23:01 +02:00
jackun
f559730d2f
Return bool from checkNvidia() 2020-02-04 23:23:00 +02:00
telans
539e1bb4dc
saturate the colors a little 2020-02-04 20:58:35 +13:00
jackun
ca0462f817
Revert "Fix Get*ProcAddr functions' exports"
This reverts commit 3f036dd3a0.
2020-02-03 02:58:43 +02:00
jackun
7f6bc9434a
Fix nvml loader's ctor 2020-02-03 00:15:58 +02:00
FlightlessMango
dcb0dcd441 Merge branch 'dynamic_nvml' 2020-02-02 02:57:48 +01:00
FlightlessMango
3d711005d4 Merge branch 'cpu' 2020-02-02 02:53:58 +01:00
FlightlessMango
3d49422325 cleaning up 2020-02-02 02:21:00 +01:00
jackun
90416278e0
Total cpu periods 2020-02-02 02:14:08 +02:00
FlightlessMango
c9e9c2feaf bring back cpu temp 2020-02-02 01:09:45 +01:00
FlightlessMango
1a60999243 New cpu implementation 2020-02-02 00:55:24 +01:00
jackun
3f036dd3a0
Fix Get*ProcAddr functions' exports 2020-02-01 23:41:15 +02:00
FlightlessMango
ac719b2ffd Check if nvml is avaible on intel vendorID 2020-02-01 22:09:35 +01:00
FlightlessMango
af17b20bd7 Use vendorID instead of deviceName to detect GPU 2020-02-01 22:07:19 +01:00
FlightlessMango
3e2f33ba1d nvmlSuccess default false 2020-02-01 02:47:25 +01:00
FlightlessMango
a93eb906e9 Don't increase size if frame_timing is false 2020-02-01 02:45:31 +01:00
FlightlessMango
1b00d29792 Removed unused histogram 2020-02-01 02:45:10 +01:00
FlightlessMango
8cdd9f19cf Dynamically load nvml library 2020-02-01 02:28:31 +01:00
FlightlessMango
a045ae3b64
Don't build with nvml for non-nvidia 2020-01-30 21:23:47 +02:00
FlightlessMango
a3fb14c0d6
Check nvmlInit() once 2020-01-30 21:23:47 +02:00
FlightlessMango
369b18eb07
Use nvml to display gpu values in hud 2020-01-30 21:23:47 +02:00
FlightlessMango
ef0b3d429e
Basic nvml implementation 2020-01-30 21:23:40 +02:00
jackun
b28e0d2606
Remove unused pipeline stats counters 2020-01-30 11:19:25 +02:00
telans
b67a2aad16
Merge branch 'telans'
Remove unused python file
Fix includes
Add package build.sh option
2020-01-29 18:40:26 +00:00
FlightlessMango
d3a588b0b0 Removed unused variables and fixed compiler warnings 2020-01-29 16:37:41 +01:00
telans
678207f052
remove unused mesa-overlay-control.py 2020-01-29 23:25:16 +13:00
telans
e82e3721b7
update header location & duration_env 2020-01-29 23:24:46 +13:00
telans
0287920776
remove unused git_sha1.h 2020-01-29 21:35:09 +13:00
telans
ae08d0cc21
Merge branch 'gui-color' 2020-01-28 23:29:16 +00:00
FlightlessMango
e3008126f3 We don't need to push the default font 2020-01-28 12:59:09 +01:00
FlightlessMango
af99e711b5 Reduced ImGui ItemSpacing 2020-01-28 12:58:18 +01:00
telans
f3bedf3bce
add build script "build.sh" 2020-01-28 20:20:23 +13:00
jackun
ca78a59d54 Removed graph background, plotlines color to green 2020-01-28 09:03:24 +02:00
jackun
64fd81a471 Add Unispace as default font or load a font from file specified by envvar MANGOHUD_FONT
Could make built-in font configurable by including some other source file with font data instead of src/font_unispace.c
2020-01-28 08:58:04 +02:00
FlightlessMango
f434f627fa MangoHud implicit layer manifest 2020-01-28 05:32:37 +01:00
FlightlessMango
dd78c02ed8 MangoHud Standalone
Co-authored-by: jackun <jack.un@gmail.com>
Co-authored-by: telans <telans@protonmail.com>
2020-01-28 05:11:05 +01:00