mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-01-27 09:01:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
3627 commits 12 branches 7 tags 32 MiB
Commit graph

3114 commits

Author SHA1 Message Date
Antonio Ospite d20f8f4363 st/oxr: fix building on linux with OPENGL_GLX OFF 
When building on linux and OPENGL_GLX OFF compilation fails with the
following error:

-----------------------------------------------------------------------
../../state_trackers/oxr/libst_oxr.a(oxr_session_gfx_gl.c.o): In function `oxr_session_populate_gl_xlib':
oxr_session_gfx_gl.c:(.text+0x5c): undefined reference to `xrt_gfx_provider_create_gl_xlib'
collect2: error: ld returned 1 exit status
src/xrt/targets/openxr/CMakeFiles/openxr_monado.dir/build.make:126: recipe for target 'src/xrt/targets/openxr/libopenxr_monado.so' failed
make[2]: *** [src/xrt/targets/openxr/libopenxr_monado.so] Error 1
CMakeFiles/Makefile2:2490: recipe for target 'src/xrt/targets/openxr/CMakeFiles/openxr_monado.dir/all' failed
make[1]: *** [src/xrt/targets/openxr/CMakeFiles/openxr_monado.dir/all] Error 2
Makefile:145: recipe for target 'all' failed
make: *** [all] Error 2
-----------------------------------------------------------------------

Apparently the gl_xlib backend really depends on GLX specifically, so
fix the issue by reflecting that in the conditionally compiled blocks.
 2021-11-13 12:16:29 +00:00
Ryan Pavlik 185bf61dd8 comp: Migrate num_ to _count 2021-11-13 12:04:38 +00:00
Ryan Pavlik 2e323add6f drivers: Migrate num_ to _count 2021-11-13 12:04:38 +00:00
Ryan Pavlik 4957f6577f st/p: Migrate num_ to _count 2021-11-13 12:04:38 +00:00
Ryan Pavlik dfa0aba496 aux: Migrate num_ to _count 2021-11-13 12:04:38 +00:00
Ryan Pavlik 469b9d907d st/oxr: Rename all num_ in the state tracker, too. 2021-11-13 12:04:38 +00:00
Ryan Pavlik 33c0287f8b xrt: Rename all "num" parameters and fields to "count" (or "capacity" as appropriate) 
This matches the OpenXR usage: the array is the plural of the element type,
and the count is the singular element type plus "count" (usually CountOutput
because of the two-call idiom)

Includes fixes to other code to match API changes.
 2021-11-13 12:04:38 +00:00
Ryan Pavlik 5e55b9d992 xrt: Prober docs. 2021-11-13 12:04:38 +00:00
Mateo de Mayo b94b7d1f52 u/json: Implement C++ wrapper for cJSON 2021-11-12 15:33:06 -03:00
Mateo de Mayo 87a1198b0a misc: Address compilation warnings and fix u_json_get_bool 2021-11-12 15:33:06 -03:00
Ryan Pavlik cc4007a69e cmake: Substantial cleanups and simplifications 
We now have a cmake-format config file.
We no longer use list variables for sources, instead using
target_sources when we need to add, in accordance with current
best practice. (This makes it a lot easier to edit too.) There's no more
include_directories(), add_definitions(), or other gently-deprecated
directory-scoped commands, nor any CMake scripts that include
a parent directory reference (named targets instead)
 2021-11-12 09:48:37 -06:00
Ryan Pavlik 19947a2d27 cmake: Refactor how we build imgui 2021-11-12 09:38:50 -06:00
Jakob Bornecrantz 62ca16c70e a/math: Make sure it's safe to pass in the result as either left or right 2021-11-12 10:27:54 +00:00
Ryan Pavlik b180b244e3 st/oxr: Populate oxr_system's blend modes list from the system compositor, not the device. 2021-11-12 03:05:10 +00:00
Ryan Pavlik 201765d3a7 comp: Populate blend mode list in system compositor info from device 2021-11-12 03:05:10 +00:00
Ryan Pavlik cd5ac5f1c9 xrt: Support multiple blend modes in system compositor info 2021-11-12 03:05:10 +00:00
Jakob Bornecrantz 7ecf649ac2 c/render: Use new Vulkan helpers 2021-11-10 14:22:28 +00:00
Jakob Bornecrantz e8b0ab3b35 aux/vk: Add many more helper functions 2021-11-10 14:22:28 +00:00
Jakob Bornecrantz 5554b0fa00 st/prober: Fix warning and tidy code 2021-11-10 11:32:54 +00:00
Ryan Pavlik 35d7e85266 a/vk: Return of the justification and function rename 2021-11-09 15:36:24 -06:00
Ryan Pavlik b816c08141 a/vk: Add to the file comments mentioning the script. 2021-11-09 11:05:15 -06:00
Ryan Pavlik 8a56046c1d a/vk: Also generate the extension list/checking 2021-11-09 11:05:15 -06:00
Ryan Pavlik 9fc992d540 a/vk: Normalize member names in extensions 2021-11-09 11:05:15 -06:00
Ryan Pavlik 01c02897dc a/vk: Update vulkan files: generate from script 2021-11-09 11:05:15 -06:00
Nima01 2a1e6debfb st/prober: Support for querying of 'Product name' from Bluetooth devices. 2021-11-09 01:10:20 +00:00
Jakob Bornecrantz a081bacc5d aux/vk: Guard vkSignalSemaphore with VK_KHR_timeline_semaphore 2021-11-08 17:36:58 +00:00
Jakob Bornecrantz 4c4e30d875 aux/vk: Add more functions 2021-11-08 17:21:31 +00:00
Ryan Pavlik fa308848ab android: Update source link for licenses 2021-11-08 09:45:00 -06:00
Moses Turner c1d4314aad d/ht: move DEBUG_GET_ONCE_LOG_OPTION to ht_driver.cpp (NFC) 
Fixes an annoying warning.
 2021-11-08 08:11:26 -06:00
Simon Zeni 49d2d81940 d/ht: split ht_algorithm into source and header 2021-11-08 13:56:37 +00:00
Simon Zeni 39bc129564 d/ht: split ht_models into source and header 2021-11-08 13:56:37 +00:00
Simon Zeni 7618a7e34d d/ht: split ht_nms into source and header 2021-11-08 13:56:37 +00:00
Simon Zeni 83630efc3d d/ht: split ht_image_math into source and header 2021-11-08 13:56:37 +00:00
Simon Zeni 44b46a28bf d/ht: split ht_hand_math into source and header 2021-11-08 13:56:37 +00:00
Jakob Bornecrantz f10951b5ac t/openxr: Only link against qwerty driver if built 2021-11-08 13:07:22 +00:00
Jakob Bornecrantz 551c1f19a9 st/prober: Depend on VF driver since we refer to it directly 2021-11-08 13:07:22 +00:00
Jakob Bornecrantz 42b0361852 c/main: Use Vulkan helper in util 2021-11-07 15:14:04 +00:00
Jakob Bornecrantz 7703b7104b c/main: Tidy extensions 2021-11-06 10:51:19 +00:00
Jakob Bornecrantz a97523591f c/util: Add Vulkan helper 2021-11-06 10:51:19 +00:00
Jakob Bornecrantz 2a536f17d1 cmake: Remove missed source array 2021-11-05 15:56:14 +00:00
Jakob Bornecrantz 56b5918d69 c/main: Fix tab CVK_ERROR macro 2021-11-04 20:57:55 +00:00
Jakob Bornecrantz c912c67dc6 c/main: Use comp_base 2021-11-04 20:57:53 +00:00
Jakob Bornecrantz a1b515616a c/render: Documentation 2021-11-04 20:56:21 +00:00
Jakob Bornecrantz 6e28533bdc c/render: Break out into own library 2021-11-04 20:56:21 +00:00
Jakob Bornecrantz e08c1b1f04 c/util: Add comp_base native compositor helper base class 2021-11-04 20:56:21 +00:00
Jakob Bornecrantz c3b8810bb0 c/util: Documentation 2021-11-04 20:56:20 +00:00
Jakob Bornecrantz 029031cfd3 c/util: Break out swapchain and sync into own library 2021-11-04 20:55:48 +00:00
Jakob Bornecrantz 78936d2b4e c/main: Use get_vk more 2021-11-04 20:54:11 +00:00
Jakob Bornecrantz c6031a26e8 c/main: Refactor fence to be more independent 2021-11-04 20:46:09 +00:00
Jakob Bornecrantz 293d617dd5 c/main: Refactor swapchain to be more independent 2021-11-04 20:46:03 +00:00
Ryan Pavlik 3bd0a07aa2 cmake: Split out finding GLX from the rest of OpenGL on Linux. 
Fixes #132.
 2021-11-04 15:36:58 +00:00
Ryan Pavlik 15c8414155 cmake: Un-nest a conditional 2021-11-04 15:36:58 +00:00
Jakob Bornecrantz 36765256a6 c/render: Free command buffer when closing rendering 2021-11-03 23:10:47 +00:00
Ryan Pavlik 4759ddda63 ipc: Fix it's vs its 2021-11-03 17:29:13 -05:00
Ryan Pavlik 9ab69a2c99 d/arduino/device: Fix it's vs its 2021-11-03 17:28:56 -05:00
Ryan Pavlik 85dab57936 a/util: Fix some it's vs its 2021-11-03 17:28:41 -05:00
Ryan Pavlik 7a26a2339b comp: Fix some it's vs its. 2021-11-03 17:28:17 -05:00
Ryan Pavlik afc2af549f xrt: Improve docs for ref-counting functions. 2021-11-03 17:27:56 -05:00
Ryan Pavlik 334bd83619 a/tracking: Fix some it's vs its and other minor doc tweaks 2021-11-03 17:27:36 -05:00
Ryan Pavlik f4b61d9e41 a/os: Fix some it's vs its. 2021-11-03 17:24:17 -05:00
Ryan Pavlik a6ae6eb095 a/math: Fix some it's vs its. 2021-11-03 17:23:51 -05:00
Ryan Pavlik 86c7a27156 a/tracking: Fix doxygen warnings about invalid link requests 2021-11-03 17:13:38 -05:00
Ryan Pavlik ebde5344a1 cmake: Make compilation of the sample driver optional. 2021-11-03 17:04:05 -05:00
Ryan Pavlik 55d16046eb doc: Update driver writing documentation 2021-11-03 17:04:02 -05:00
Ryan Pavlik 33e367ee42 drivers: Add a sample driver intended for use as a template. 2021-11-03 17:00:28 -05:00
Ryan Pavlik e2c6fbdd9a cmake: Inline lists of sources for drivers, per current best practice 2021-11-03 17:00:28 -05:00
Jakob Bornecrantz ec9cfa690d c/render: s/rts/rtr/g 2021-11-03 13:28:15 +00:00
Jakob Bornecrantz 12bfc8b5c9 c/render: Do not depend on the compositor 2021-11-03 13:26:42 +00:00
Jakob Bornecrantz c346d812c7 c/render: Add helpers to access the vk_bundle 2021-11-03 13:25:15 +00:00
Jakob Bornecrantz 648f49f4ef c/render: Change argument order to object first 2021-11-03 13:25:15 +00:00
Jakob Bornecrantz ccc4bbcf86 c/render: Remove unused disable_atw argument 2021-11-03 13:25:15 +00:00
Jakob Bornecrantz 56f4466ffa c/render: Move shaders to render 2021-11-03 13:25:15 +00:00
Jakob Bornecrantz 8c8d72647b c/render: Refactor out timewarp matrix into util file 2021-11-03 13:25:15 +00:00
Jakob Bornecrantz 60024efba9 c/render: If we only have a projection layer skip the layer renderer 2021-11-03 13:25:14 +00:00
Jakob Bornecrantz 4ca35b8b3c c/render: Don't cache comp_rendering 2021-11-03 13:24:20 +00:00
Jakob Bornecrantz 847e322fe5 c/render: Remove stub function decls 2021-11-02 20:19:05 +00:00
Jakob Bornecrantz d8a580d875 c/render: Tidy compute rendering 2021-11-02 20:19:05 +00:00
Jakob Bornecrantz f74812f02e c/render: Refactor rendering code so target data is it's own struct. 2021-11-02 20:19:05 +00:00
Jakob Bornecrantz 08135b6365 c/shaders: Tidy and codestyle 2021-11-02 20:19:05 +00:00
Jakob Bornecrantz 0b9bf9c772 c/main: Do not go via target for compositor 2021-11-02 20:19:05 +00:00
Jakob Bornecrantz 765feb6fe1 c/main: Refactor mesh descriptor and UBO upload 2021-11-02 20:19:05 +00:00
Moses Turner 67430358c2 ipc: add a newline at the end of ipc_protocol_generated.h (NFC) 2021-11-01 18:01:40 -05:00
Simon Zeni c67587c066 d/ht: improve anchor data for hand detector 2021-11-01 17:54:26 -05:00
Jason McNew fd065cca6e d/wmr: Fix segfault if unsupported HoloLens Sensors device is present. 2021-10-31 17:07:55 +00:00
Jakob Bornecrantz c8ee075b8d ipc/server: Add error messages for init failures 2021-10-28 22:58:44 +00:00
Mario Kleiner a6185490e8 c/direct: Fix direct display RandR leased output on multi-X-Screen. 
The old code assumes the HMD is always connected to a RandR
output on X-Screen 0, but this is not neccessarily the case
on multi-X-Screen setups. Use a loop to iterate over all
X-Screens outputs until the HMD output is found.

Tested on single and dual X-Screen setups, also with Oculus
Rift CV1 connected to 2nd X-Screen.

This is rather useful for porting applications from "OpenHMD Rift
on separate X-Screen for performance" to OpenXR Monado direct
mode, so one can quickly switch between Monado and OpenHMD native
without cumbersome xorg.conf + logout + login games.

Signed-off-by: Mario Kleiner <mario.kleiner.de@gmail.com>
 2021-10-28 12:29:36 +00:00
Mateo de Mayo f407536279 st/prober: Hook the realsense SLAM source into the prober 2021-10-28 11:40:49 +00:00
Mateo de Mayo f84629ccbc d/rs: Split SLAM source out of rs_hdev 
(This temporarily disables the RealSense SLAM stream as there is
nothing starting it until the next commit)
 2021-10-28 11:40:49 +00:00
Mateo de Mayo 0202cb9223 st/prober: Improve usage of SLAM tracking frameservers 
Use a similar "hardcoded" idea as in p_factory_ensure_frameserver.
This fix usage of SLAM sources in other contexts like calibration, at the
cost of requiring a device to call create_tracked_slam at least once.
(again, similar to how psmv/psvr/hand tracking work already)
 2021-10-28 11:40:49 +00:00
Mateo de Mayo 773eccad6c docs: Move some driver entities into @addtogroup and other NFC 2021-10-28 11:40:49 +00:00
Mateo de Mayo 891842cb51 os: Change os_nanosleep parameter to int64_t 2021-10-28 11:40:49 +00:00
Christoph Haag cbc018239b st/gui: Fix editing tracking override when tracker is not connected 
Fixes an assertion.
 2021-10-28 11:21:58 +00:00
Christoph Haag 8da1b10010 st/gui: More consistent variable names in tracking overrides 2021-10-28 11:21:58 +00:00
Christoph Haag 9f7ef73429 st/gui: better wording for tracking override delete button 2021-10-28 11:21:58 +00:00
Ryan Pavlik 9688cd37dd xrt: Improve doc comments in compositor header 2021-10-27 17:05:55 -05:00
Jarvis Huang 6b8349c887 ipc/android: Force client entering resume state before IPC setup 2021-10-27 13:44:20 +00:00
Jarvis Huang c635375dc7 aux/android: Remove unused header file 2021-10-27 13:44:20 +00:00
Jarvis Huang 210a6908cd ipc/android: Avoid deadlock on Android 2021-10-27 13:44:20 +00:00
Christoph Haag 13f7fa3b82 ipc: Pack ipc message structs to make valgrind happy 2021-10-26 23:20:28 +02:00
Moses Turner 0dee9094b3 aux/math: encourage people to use normalized inputs to math_quat_from_plus_x_z 2021-10-26 10:56:41 +00:00
Ryan Pavlik 409541427d st/oxr: MSVC-specialized version of macro in oxr_xrResultToString 2021-10-19 16:49:23 -05:00
Ryan Pavlik 05ed361601 t/psvr: Fix some truncation warnings. 2021-10-19 16:49:13 -05:00
Ryan Pavlik b62fb33e36 d/wmr: Fix some truncation warnings. 2021-10-19 16:11:34 -05:00
Ryan Pavlik 4ae1a1753c util: Fix typo 2021-10-19 16:11:34 -05:00
Ryan Pavlik d4d6a1a73f util: Fix some truncation warnings, mostly by explicitly casting 2021-10-19 16:11:34 -05:00
Ryan Pavlik 5f8cb4e227 a/math: Fix some truncation warnings. 2021-10-19 15:31:29 -05:00
Mateo de Mayo 1095c3a2c1 d/rs: Add pose correction for Basalt 2021-10-16 17:03:02 -03:00
Mateo de Mayo ab2da01631 build: Add Basalt as an external SLAM system 2021-10-16 17:02:27 -03:00
Ryan Pavlik 782aa11754 comp/main: Initial wiring, but don't actually allow closing the window on Windows for now. 2021-10-15 15:29:58 -05:00
Ryan Pavlik cb3fc65f14 comp/main: Win32: Spawn a thread for our windowed output. 2021-10-15 15:13:00 -05:00
Ryan Pavlik c47463b4eb aux/util: Fix log message formatting on Windows. 2021-10-15 15:05:34 -05:00
Ryan Pavlik c40553580d util: Fix copyright typo. 2021-10-15 14:55:12 -05:00
Ryan Pavlik d6177777e5 os: Fix os_nanosleep on Windows. 2021-10-15 13:05:18 -05:00
Ryan Pavlik 3351ef5396 os: Add new thread helper methods 2021-10-15 13:05:18 -05:00
Ryan Pavlik 793a7d659d os: Improve docs for thread helper. 2021-10-15 11:57:44 -05:00
Ryan Pavlik 2790f6d29f comp: Fix windows build - near and far are keywords. 2021-10-15 10:15:16 -05:00
Moses Turner d440a23888 d/dai: rename things to either 'monocular' or 'grayscale' 2021-10-13 16:26:26 -05:00
Jakob Bornecrantz 0d07971ebb st/gui: Make it possible to use depthAI as a stereo and single source 2021-10-13 15:47:48 -05:00
Jakob Bornecrantz 21f6842e49 st/gui: Add some debugging to the paranoia 2021-10-12 20:44:32 +01:00
Jakob Bornecrantz be9a91fd12 d/dai: Explicitly close queue to avoid use after free errors from asan 2021-10-12 20:44:32 +01:00
Jakob Bornecrantz 6f22d4d819 d/dai: Handle cameras without calibration data 2021-10-12 15:37:42 +01:00
Jakob Bornecrantz c5b2c5827b d/dai: Some tidy 2021-10-11 21:45:38 +01:00
Jakob Bornecrantz a5fc2fa49e d/dai: Expose function to get stereo calibration 2021-10-10 00:16:39 +01:00
Jakob Bornecrantz 3fd740e6e9 d/dai: Add support for a stereo pipeline via slam_stream_start 2021-10-09 22:28:11 +01:00
Jakob Bornecrantz 344b5d9755 d/dai: Refactor out create function 2021-10-09 22:28:11 +01:00
Jakob Bornecrantz e1dd59f749 d/dai: Refactor out pipeline setup to helper function 2021-10-09 22:28:11 +01:00
Jakob Bornecrantz b8e2cbd9ee d/dai: Add code to extract calibration of gray stereo cameras 2021-10-09 22:28:11 +01:00
Jakob Bornecrantz 8c242c1bc1 d/dai: Work around RGB_OV_9782 not yet being supported on main 2021-10-09 22:28:11 +01:00
Jakob Bornecrantz c2b00ebb18 d/dai: Switch default logging to info 2021-10-09 22:28:11 +01:00
Jakob Bornecrantz 580a2f6fff u/sink: Add u_sink_combiner helper to combine frames to stereo frames 2021-10-09 22:28:11 +01:00
Jakob Bornecrantz e8f7f2de0a t/util: Add function to dump a stereo camera calibration 2021-10-09 22:28:11 +01:00
Mateo de Mayo 7f247604e3 build: Use pkg-config for finding SLAM systems in CMake and other minor improvements 2021-10-07 14:33:10 -03:00
Mateo de Mayo 9b21b7d36c t/slam: Use debug assertions and ensure timestamps come in order 2021-10-06 16:41:18 -03:00
Mateo de Mayo df3c36ba0c d/rs: Improve how hdev handles IMU samples 
- Prevent race conditions with a lock
- Check that timestamps "domains" are the same across samples
- Use faster sensor to push the IMU sample instead of always gyro
 2021-10-06 16:41:18 -03:00
Mateo de Mayo 67a5946778 xrt: Add units to xrt_imu_sample fields 
After using the structure a bit more, and realizing that while different components
sometimes use different units, it is easier to force them to send the imu_samples
in a standardized unit.
 2021-10-06 16:41:18 -03:00
Mateo de Mayo 5845155229 xrt: Use doubles in xrt_vec3_f64 2021-10-06 15:23:28 -03:00
Moses Turner 5abd3b3570 d/ht: Switch to new get_hand_tracking signature and update tracking 2021-10-02 23:09:36 +01:00
Moses Turner 322d5b8f2d d/remote: Switch to new get_hand_tracking signature 2021-10-02 23:09:25 +01:00
Moses Turner 621681ffb4 d/vive: Switch to new get_hand_tracking signature 2021-10-02 23:09:14 +01:00
Moses Turner 9f0de997d1 d/ulv2: Switch to new get_hand_tracking signature 2021-10-02 23:08:12 +01:00
Moses Turner 193dcc8776 d/survive: Switch to new get_hand_tracking signature 2021-10-02 23:08:09 +01:00
Moses Turner bec03a09bc d/multi: Switch to new get_hand_tracking signature 2021-10-02 23:08:06 +01:00
Moses Turner 8fdeaccbc7 st/oxr: Switch to new get_hand_tracking signature 2021-10-02 23:06:43 +01:00
Moses Turner 1a4dd31b5e ipc: Switch to new get_hand_tracking signature 2021-10-02 23:06:29 +01:00
Moses Turner ca007be4d5 xrt: Switch to new get_hand_tracking signature 2021-10-02 23:05:46 +01:00
Moses Turner e134b24f8f u/var: Add u_var_draggable_f32 2021-10-02 23:05:35 +01:00
Moses Turner 5efdea78da aux/gst: Expose function to get offset from global time to video timestamp 2021-10-02 23:05:26 +01:00
Ryan Pavlik 37c5eee02a a/math: Refactor one euro filter code 2021-10-02 23:05:22 +01:00
Moses Turner 52f1ce14ca aux/math: Add m_vec2_lerp 2021-10-02 23:05:19 +01:00
Moses Turner b067d3b0c2 d/vf: Fix typo 2021-10-02 23:05:16 +01:00