mirror of
https://github.com/WiVRn/WiVRn.git
synced 2026-11-20 00:51:32 -08:00
Update monado
This commit is contained in:
1 parent
57ba039f51
commit
fb3f7a1599
16 files changed
+87
-111
No files matched your search
@@ -58,7 +58,7 @@
|
||||
# Keep in sync with CMakeLists.txt monado rev
|
||||
rev = builtins.readFile ./monado-rev;
|
||||
# Nix will output the correct hash when it doesn't match
|
||||
hash = "sha256-eClQDbBbWM6DBg9L3/+ya10Wq8kznKYPiwg46qhGJ0M=";
|
||||
hash = "sha256-aYRaEblJyec7NeLaP9EG7bzRHfNJIjG6NzN6rcotmtU=";
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
+1
-1
@@ -1 +1 @@
|
||||
b17c9d6ee418750a5b7bdd31b08a7ce2f504f8bc
|
||||
fc25dfcb573ae3d73f1058ab128ad67b1cd98439
|
||||
@@ -1,7 +1,7 @@
|
||||
From d42bb722366501e7d9026cd1b2a18fc95da562f3 Mon Sep 17 00:00:00 2001
|
||||
From 2c8815be65917e342c040629d3a5f846bc4417bb Mon Sep 17 00:00:00 2001
|
||||
From: Patrick Nicolas <[email protected]>
|
||||
Date: Tue, 22 Oct 2024 15:23:19 +0200
|
||||
Subject: [PATCH 1/7] c/multi: early wake of compositor
|
||||
Subject: [PATCH 1/6] c/multi: early wake of compositor
|
||||
|
||||
---
|
||||
.../compositor/multi/comp_multi_compositor.c | 14 +++++++++
|
||||
@@ -51,10 +51,10 @@ index 3351defa4..e8f0c8295 100644
|
||||
{
|
||||
int64_t predicted_display_time_ns;
|
||||
diff --git a/src/xrt/compositor/multi/comp_multi_system.c b/src/xrt/compositor/multi/comp_multi_system.c
|
||||
index cf8e2e525..94413b090 100644
|
||||
index 199025a13..35ca4aa29 100644
|
||||
--- a/src/xrt/compositor/multi/comp_multi_system.c
|
||||
+++ b/src/xrt/compositor/multi/comp_multi_system.c
|
||||
@@ -23,6 +23,8 @@
|
||||
@@ -24,6 +24,8 @@
|
||||
#include "util/u_trace_marker.h"
|
||||
#include "util/u_distortion_mesh.h"
|
||||
|
||||
@@ -63,7 +63,7 @@ index cf8e2e525..94413b090 100644
|
||||
#ifdef XRT_OS_LINUX
|
||||
#include "util/u_linux.h"
|
||||
#endif
|
||||
@@ -392,17 +394,24 @@ broadcast_timings_to_pacers(struct multi_system_compositor *msc,
|
||||
@@ -393,17 +395,24 @@ broadcast_timings_to_pacers(struct multi_system_compositor *msc,
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -93,7 +93,7 @@ index cf8e2e525..94413b090 100644
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -528,10 +537,13 @@ multi_main_loop(struct multi_system_compositor *msc)
|
||||
@@ -529,10 +538,13 @@ multi_main_loop(struct multi_system_compositor *msc)
|
||||
broadcast_timings_to_clients(msc, predicted_display_time_ns);
|
||||
|
||||
// Now we can wait.
|
||||
@@ -109,7 +109,7 @@ index cf8e2e525..94413b090 100644
|
||||
|
||||
// Now we know the diff, broadcast to pacers.
|
||||
broadcast_timings_to_pacers(msc, predicted_display_time_ns, predicted_display_period_ns, diff_ns);
|
||||
@@ -708,6 +720,8 @@ system_compositor_destroy(struct xrt_system_compositor *xsc)
|
||||
@@ -718,6 +730,8 @@ system_compositor_destroy(struct xrt_system_compositor *xsc)
|
||||
xrt_comp_native_destroy(&msc->xcn);
|
||||
|
||||
os_mutex_destroy(&msc->list_and_timing_lock);
|
||||
@@ -118,7 +118,7 @@ index cf8e2e525..94413b090 100644
|
||||
|
||||
free(msc);
|
||||
}
|
||||
@@ -762,6 +776,8 @@ comp_multi_create_system_compositor(struct xrt_compositor_native *xcn,
|
||||
@@ -772,6 +786,8 @@ comp_multi_create_system_compositor(struct xrt_compositor_native *xcn,
|
||||
msc->sessions.state = do_warm_start ? MULTI_SYSTEM_STATE_INIT_WARM_START : MULTI_SYSTEM_STATE_STOPPED;
|
||||
|
||||
os_mutex_init(&msc->list_and_timing_lock);
|
||||
|
||||
+3
-3
@@ -1,14 +1,14 @@
|
||||
From 8681efcccdcf2a428bfca52f869560dcdcb8d76b Mon Sep 17 00:00:00 2001
|
||||
From 69469ad46f9caf5a55dad24d29c51b7ae712f44e Mon Sep 17 00:00:00 2001
|
||||
From: Patrick Nicolas <[email protected]>
|
||||
Date: Tue, 8 Oct 2024 22:13:15 +0200
|
||||
Subject: [PATCH 3/7] Use extern socket fd
|
||||
Subject: [PATCH 2/6] Use extern socket fd
|
||||
|
||||
---
|
||||
src/xrt/ipc/server/ipc_server_mainloop_linux.c | 8 ++++++++
|
||||
1 file changed, 8 insertions(+)
|
||||
|
||||
diff --git a/src/xrt/ipc/server/ipc_server_mainloop_linux.c b/src/xrt/ipc/server/ipc_server_mainloop_linux.c
|
||||
index ad6b473b7..ea6fad65b 100644
|
||||
index d364fbed3..f05763966 100644
|
||||
--- a/src/xrt/ipc/server/ipc_server_mainloop_linux.c
|
||||
+++ b/src/xrt/ipc/server/ipc_server_mainloop_linux.c
|
||||
@@ -55,6 +55,8 @@
|
||||
@@ -1,25 +0,0 @@
|
||||
From 7c6c7401c70fa4f1935ddd5404cddcda86bb891d Mon Sep 17 00:00:00 2001
|
||||
From: Patrick Nicolas <[email protected]>
|
||||
Date: Tue, 2 Apr 2024 17:14:42 +0200
|
||||
Subject: [PATCH 2/7] ipc/server: Always listen to stdin
|
||||
|
||||
---
|
||||
src/xrt/ipc/server/ipc_server_mainloop_linux.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/xrt/ipc/server/ipc_server_mainloop_linux.c b/src/xrt/ipc/server/ipc_server_mainloop_linux.c
|
||||
index d364fbed3..ad6b473b7 100644
|
||||
--- a/src/xrt/ipc/server/ipc_server_mainloop_linux.c
|
||||
+++ b/src/xrt/ipc/server/ipc_server_mainloop_linux.c
|
||||
@@ -186,7 +186,7 @@ init_epoll(struct ipc_server_mainloop *ml)
|
||||
|
||||
struct epoll_event ev = {0};
|
||||
|
||||
- if (!ml->launched_by_socket && !debug_get_bool_option_skip_stdin()) {
|
||||
+ if (!debug_get_bool_option_skip_stdin()) {
|
||||
// Can't do this when launched by systemd socket activation by
|
||||
// default.
|
||||
// This polls stdin.
|
||||
--
|
||||
2.51.2
|
||||
|
||||
+4
-4
@@ -1,17 +1,17 @@
|
||||
From a3ed1a033480b4a3bb72b326a0ca8cff49fee771 Mon Sep 17 00:00:00 2001
|
||||
From c0b95fc2f3bae2239b69df6dc448b98432e0b746 Mon Sep 17 00:00:00 2001
|
||||
From: galister <[email protected]>
|
||||
Date: Sat, 23 Nov 2024 02:42:12 +0900
|
||||
Subject: [PATCH 4/7] change environment blend mode selection logic
|
||||
Subject: [PATCH 3/6] change environment blend mode selection logic
|
||||
|
||||
---
|
||||
src/xrt/compositor/multi/comp_multi_system.c | 26 +++++++++++++-------
|
||||
1 file changed, 17 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/src/xrt/compositor/multi/comp_multi_system.c b/src/xrt/compositor/multi/comp_multi_system.c
|
||||
index 94413b090..0d958c3af 100644
|
||||
index 35ca4aa29..1d162a45d 100644
|
||||
--- a/src/xrt/compositor/multi/comp_multi_system.c
|
||||
+++ b/src/xrt/compositor/multi/comp_multi_system.c
|
||||
@@ -232,23 +232,31 @@ find_active_blend_mode(struct multi_compositor **overlay_sorted_clients, size_t
|
||||
@@ -233,23 +233,31 @@ find_active_blend_mode(struct multi_compositor **overlay_sorted_clients, size_t
|
||||
if (overlay_sorted_clients == NULL)
|
||||
return XRT_BLEND_MODE_OPAQUE;
|
||||
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
From dd29abe017730f618e43abec0e4df8491aab13cc Mon Sep 17 00:00:00 2001
|
||||
From d29c35507c125fa720f9e20f1c70aa09180f6e5a Mon Sep 17 00:00:00 2001
|
||||
From: Patrick Nicolas <[email protected]>
|
||||
Date: Sat, 15 Mar 2025 22:19:48 +0100
|
||||
Subject: [PATCH 5/7] st/oxr: forward 0 refresh rate
|
||||
Subject: [PATCH 4/6] st/oxr: forward 0 refresh rate
|
||||
|
||||
---
|
||||
src/xrt/compositor/main/comp_compositor.c | 2 +-
|
||||
+29
-29
@@ -1,7 +1,7 @@
|
||||
From 7f2d689e1e9c6989bff02e18b232abce59f821ca Mon Sep 17 00:00:00 2001
|
||||
From feea3035968d20b8bf87d35aa3654ba4162b6ae9 Mon Sep 17 00:00:00 2001
|
||||
From: Patrick Nicolas <[email protected]>
|
||||
Date: Wed, 11 Sep 2024 22:56:29 +0200
|
||||
Subject: [PATCH 6/7] Replace distortion with foveation
|
||||
Subject: [PATCH 5/6] Replace distortion with foveation
|
||||
|
||||
---
|
||||
src/xrt/compositor/CMakeLists.txt | 4 +-
|
||||
@@ -41,7 +41,7 @@ index 1ba5ec438..eb068f5fc 100644
|
||||
render/render_interface.h
|
||||
render/render_resources.c
|
||||
diff --git a/src/xrt/compositor/main/comp_renderer.c b/src/xrt/compositor/main/comp_renderer.c
|
||||
index 2c83d865d..86e97eb14 100644
|
||||
index 6cbb17813..d9460aa52 100644
|
||||
--- a/src/xrt/compositor/main/comp_renderer.c
|
||||
+++ b/src/xrt/compositor/main/comp_renderer.c
|
||||
@@ -986,7 +986,8 @@ dispatch_compute(struct comp_renderer *r,
|
||||
@@ -655,10 +655,10 @@ index 62d7138b9..44c3f0aee 100644
|
||||
.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED,
|
||||
.image = target_image,
|
||||
diff --git a/src/xrt/compositor/render/render_interface.h b/src/xrt/compositor/render/render_interface.h
|
||||
index bcc7e30ce..e6d3e2ebf 100644
|
||||
index 5db279a21..0df8fa58d 100644
|
||||
--- a/src/xrt/compositor/render/render_interface.h
|
||||
+++ b/src/xrt/compositor/render/render_interface.h
|
||||
@@ -74,12 +74,8 @@ extern "C" {
|
||||
@@ -75,12 +75,8 @@ extern "C" {
|
||||
#define RENDER_MAX_LAYER_RUNS_SIZE (XRT_MAX_VIEWS)
|
||||
#define RENDER_MAX_LAYER_RUNS_COUNT(RENDER_RESOURCES) (RENDER_RESOURCES->view_count)
|
||||
|
||||
@@ -673,7 +673,7 @@ index bcc7e30ce..e6d3e2ebf 100644
|
||||
|
||||
//! The binding that the layer projection and quad shader have their UBO on.
|
||||
#define RENDER_BINDING_LAYER_SHARED_UBO 0
|
||||
@@ -94,12 +90,6 @@ extern "C" {
|
||||
@@ -95,12 +91,6 @@ extern "C" {
|
||||
*
|
||||
*/
|
||||
|
||||
@@ -686,7 +686,7 @@ index bcc7e30ce..e6d3e2ebf 100644
|
||||
/*!
|
||||
* Calculates a timewarp matrix which takes in NDC coords and gives out results
|
||||
* in [-1, 1] space that needs a perspective divide.
|
||||
@@ -487,7 +477,8 @@ struct render_resources
|
||||
@@ -488,7 +478,8 @@ struct render_resources
|
||||
uint32_t distortion_binding;
|
||||
|
||||
//! Writing the image out too.
|
||||
@@ -696,7 +696,7 @@ index bcc7e30ce..e6d3e2ebf 100644
|
||||
|
||||
//! Uniform data binding.
|
||||
uint32_t ubo_binding;
|
||||
@@ -524,9 +515,6 @@ struct render_resources
|
||||
@@ -525,9 +516,6 @@ struct render_resources
|
||||
//! Doesn't depend on target so is static.
|
||||
VkPipeline pipeline;
|
||||
|
||||
@@ -706,7 +706,7 @@ index bcc7e30ce..e6d3e2ebf 100644
|
||||
//! Target info.
|
||||
struct render_buffer ubo;
|
||||
} distortion;
|
||||
@@ -548,17 +536,11 @@ struct render_resources
|
||||
@@ -549,17 +537,11 @@ struct render_resources
|
||||
//! Transform to go from UV to tangle angles.
|
||||
struct xrt_normalized_rect uv_to_tanangle[XRT_MAX_VIEWS];
|
||||
|
||||
@@ -728,7 +728,7 @@ index bcc7e30ce..e6d3e2ebf 100644
|
||||
} distortion;
|
||||
};
|
||||
|
||||
@@ -1264,6 +1246,7 @@ struct render_compute_layer_ubo_data
|
||||
@@ -1277,6 +1259,7 @@ struct render_compute_layer_ubo_data
|
||||
//! Timewarp matrices
|
||||
struct xrt_matrix_4x4 transforms_timewarp[RENDER_MAX_LAYERS];
|
||||
|
||||
@@ -736,7 +736,7 @@ index bcc7e30ce..e6d3e2ebf 100644
|
||||
/*!
|
||||
* For quad layers
|
||||
*/
|
||||
@@ -1303,6 +1286,14 @@ struct render_compute_distortion_ubo_data
|
||||
@@ -1316,6 +1299,14 @@ struct render_compute_distortion_ubo_data
|
||||
struct xrt_matrix_4x4 transform_timewarp_scanout_end[XRT_MAX_VIEWS];
|
||||
};
|
||||
|
||||
@@ -751,7 +751,7 @@ index bcc7e30ce..e6d3e2ebf 100644
|
||||
/*!
|
||||
* Init struct and create resources needed for compute rendering.
|
||||
*
|
||||
@@ -1356,7 +1347,8 @@ render_compute_layers(struct render_compute *render,
|
||||
@@ -1369,7 +1360,8 @@ render_compute_layers(struct render_compute *render,
|
||||
VkSampler src_samplers[RENDER_MAX_IMAGES_SIZE],
|
||||
VkImageView src_image_views[RENDER_MAX_IMAGES_SIZE],
|
||||
uint32_t num_srcs,
|
||||
@@ -761,7 +761,7 @@ index bcc7e30ce..e6d3e2ebf 100644
|
||||
const struct render_viewport_data *view,
|
||||
bool timewarp);
|
||||
|
||||
@@ -1364,44 +1356,14 @@ render_compute_layers(struct render_compute *render,
|
||||
@@ -1377,44 +1369,14 @@ render_compute_layers(struct render_compute *render,
|
||||
* @public @memberof render_compute
|
||||
*/
|
||||
void
|
||||
@@ -814,7 +814,7 @@ index bcc7e30ce..e6d3e2ebf 100644
|
||||
|
||||
/*!
|
||||
* @public @memberof render_compute
|
||||
@@ -1409,7 +1371,8 @@ render_compute_projection_no_timewarp(struct render_compute *render,
|
||||
@@ -1422,7 +1384,8 @@ render_compute_projection_no_timewarp(struct render_compute *render,
|
||||
void
|
||||
render_compute_clear(struct render_compute *render,
|
||||
VkImage target_image,
|
||||
@@ -1408,10 +1408,10 @@ index bd7ab2957..c2b95d68d 100644
|
||||
bool do_timewarp);
|
||||
|
||||
diff --git a/src/xrt/compositor/util/comp_render_cs.c b/src/xrt/compositor/util/comp_render_cs.c
|
||||
index f7da44e7f..d29a38ab2 100644
|
||||
index a0cc735a1..f75efddf4 100644
|
||||
--- a/src/xrt/compositor/util/comp_render_cs.c
|
||||
+++ b/src/xrt/compositor/util/comp_render_cs.c
|
||||
@@ -347,7 +347,8 @@ crc_clear_output(struct render_compute *render, const struct comp_render_dispatc
|
||||
@@ -370,7 +370,8 @@ crc_clear_output(struct render_compute *render, const struct comp_render_dispatc
|
||||
render_compute_clear( //
|
||||
render, //
|
||||
d->target.cs.image, //
|
||||
@@ -1421,7 +1421,7 @@ index f7da44e7f..d29a38ab2 100644
|
||||
target_viewport_datas); // views
|
||||
}
|
||||
|
||||
@@ -373,9 +374,6 @@ crc_distortion_after_squash(struct render_compute *render, const struct comp_ren
|
||||
@@ -396,9 +397,6 @@ crc_distortion_after_squash(struct render_compute *render, const struct comp_ren
|
||||
VkSampler src_samplers[XRT_MAX_VIEWS];
|
||||
struct render_viewport_data target_viewport_datas[XRT_MAX_VIEWS];
|
||||
struct xrt_normalized_rect src_norm_rects[XRT_MAX_VIEWS];
|
||||
@@ -1431,7 +1431,7 @@ index f7da44e7f..d29a38ab2 100644
|
||||
|
||||
for (uint32_t i = 0; i < d->target.view_count; i++) {
|
||||
// Data to be filled in.
|
||||
@@ -393,36 +391,17 @@ crc_distortion_after_squash(struct render_compute *render, const struct comp_ren
|
||||
@@ -416,36 +414,17 @@ crc_distortion_after_squash(struct render_compute *render, const struct comp_ren
|
||||
src_norm_rects[i] = src_norm_rect;
|
||||
src_samplers[i] = clamp_to_border_black;
|
||||
target_viewport_datas[i] = viewport_data;
|
||||
@@ -1477,7 +1477,7 @@ index f7da44e7f..d29a38ab2 100644
|
||||
}
|
||||
|
||||
/// Fast path
|
||||
@@ -448,20 +427,12 @@ crc_distortion_fast_path(struct render_compute *render,
|
||||
@@ -471,20 +450,12 @@ crc_distortion_fast_path(struct render_compute *render,
|
||||
VkSampler src_samplers[XRT_MAX_VIEWS];
|
||||
struct render_viewport_data target_viewport_datas[XRT_MAX_VIEWS];
|
||||
struct xrt_normalized_rect src_norm_rects[XRT_MAX_VIEWS];
|
||||
@@ -1498,7 +1498,7 @@ index f7da44e7f..d29a38ab2 100644
|
||||
uint32_t array_index = vds[i]->sub.array_index;
|
||||
const struct comp_swapchain_image *image = get_layer_image(layer, i, vds[i]->sub.image_index);
|
||||
|
||||
@@ -469,10 +440,6 @@ crc_distortion_fast_path(struct render_compute *render,
|
||||
@@ -492,10 +463,6 @@ crc_distortion_fast_path(struct render_compute *render,
|
||||
src_image_view = get_image_view(image, data->flags, array_index);
|
||||
src_norm_rect = vds[i]->sub.norm_rect;
|
||||
viewport_data = d->views[i].target.viewport_data;
|
||||
@@ -1509,7 +1509,7 @@ index f7da44e7f..d29a38ab2 100644
|
||||
|
||||
// No layer squasher has handled this for us already
|
||||
if (data->flip_y) {
|
||||
@@ -485,35 +452,17 @@ crc_distortion_fast_path(struct render_compute *render,
|
||||
@@ -508,35 +475,17 @@ crc_distortion_fast_path(struct render_compute *render,
|
||||
src_norm_rects[i] = src_norm_rect;
|
||||
src_samplers[i] = clamp_to_border_black;
|
||||
target_viewport_datas[i] = viewport_data;
|
||||
@@ -1554,7 +1554,7 @@ index f7da44e7f..d29a38ab2 100644
|
||||
}
|
||||
|
||||
|
||||
@@ -533,7 +482,8 @@ comp_render_cs_layer(struct render_compute *render,
|
||||
@@ -556,7 +505,8 @@ comp_render_cs_layer(struct render_compute *render,
|
||||
const struct xrt_pose *world_pose_scanout_end,
|
||||
const struct xrt_pose *eye_pose,
|
||||
const VkImage target_image,
|
||||
@@ -1564,7 +1564,7 @@ index f7da44e7f..d29a38ab2 100644
|
||||
const struct render_viewport_data *target_view,
|
||||
bool do_timewarp)
|
||||
{
|
||||
@@ -541,9 +491,9 @@ comp_render_cs_layer(struct render_compute *render,
|
||||
@@ -564,9 +514,9 @@ comp_render_cs_layer(struct render_compute *render,
|
||||
VkSampler clamp_to_border_black = render->r->samplers.clamp_to_border_black;
|
||||
|
||||
// Not the transform of the views, but the inverse: actual view matrices.
|
||||
@@ -1576,7 +1576,7 @@ index f7da44e7f..d29a38ab2 100644
|
||||
|
||||
struct render_buffer *ubo = &render->r->compute.layer.ubos[view_index];
|
||||
struct render_compute_layer_ubo_data *ubo_data = ubo->mapped;
|
||||
@@ -595,7 +545,7 @@ comp_render_cs_layer(struct render_compute *render,
|
||||
@@ -618,7 +568,7 @@ comp_render_cs_layer(struct render_compute *render,
|
||||
case XRT_LAYER_CYLINDER:
|
||||
do_cs_cylinder_layer( //
|
||||
layer, // layer
|
||||
@@ -1585,7 +1585,7 @@ index f7da44e7f..d29a38ab2 100644
|
||||
&world_view_mat_scanout_begin, // world_view_mat
|
||||
view_index, // view_index
|
||||
cur_layer, // cur_layer
|
||||
@@ -610,7 +560,7 @@ comp_render_cs_layer(struct render_compute *render,
|
||||
@@ -633,7 +583,7 @@ comp_render_cs_layer(struct render_compute *render,
|
||||
case XRT_LAYER_EQUIRECT2:
|
||||
do_cs_equirect2_layer( //
|
||||
layer, // layer
|
||||
@@ -1594,7 +1594,7 @@ index f7da44e7f..d29a38ab2 100644
|
||||
&world_view_mat_scanout_begin, // world_view_mat
|
||||
view_index, // view_index
|
||||
cur_layer, // cur_layer
|
||||
@@ -626,7 +576,7 @@ comp_render_cs_layer(struct render_compute *render,
|
||||
@@ -649,7 +599,7 @@ comp_render_cs_layer(struct render_compute *render,
|
||||
case XRT_LAYER_PROJECTION: {
|
||||
do_cs_projection_layer( //
|
||||
layer, // layer
|
||||
@@ -1603,7 +1603,7 @@ index f7da44e7f..d29a38ab2 100644
|
||||
view_index, // view_index
|
||||
cur_layer, // cur_layer
|
||||
cur_image, // cur_image
|
||||
@@ -641,8 +591,8 @@ comp_render_cs_layer(struct render_compute *render,
|
||||
@@ -664,8 +614,8 @@ comp_render_cs_layer(struct render_compute *render,
|
||||
case XRT_LAYER_QUAD: {
|
||||
do_cs_quad_layer( //
|
||||
layer, // layer
|
||||
@@ -1614,7 +1614,7 @@ index f7da44e7f..d29a38ab2 100644
|
||||
view_index, // view_index
|
||||
cur_layer, // cur_layer
|
||||
cur_image, // cur_image
|
||||
@@ -690,7 +640,8 @@ comp_render_cs_layer(struct render_compute *render,
|
||||
@@ -713,7 +663,8 @@ comp_render_cs_layer(struct render_compute *render,
|
||||
src_samplers, //
|
||||
src_image_views, //
|
||||
cur_image, //
|
||||
@@ -1624,7 +1624,7 @@ index f7da44e7f..d29a38ab2 100644
|
||||
target_view, //
|
||||
do_timewarp); //
|
||||
}
|
||||
@@ -727,6 +678,7 @@ comp_render_cs_layers(struct render_compute *render,
|
||||
@@ -750,6 +701,7 @@ comp_render_cs_layers(struct render_compute *render,
|
||||
&view->eye_pose, //
|
||||
view->squash.image, //
|
||||
view->squash.cs.storage_view, //
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
From 76f5a14ffa428a716c3076b7029539a6f8072f1a Mon Sep 17 00:00:00 2001
|
||||
From 59081b09d13a393ce54c25dd0ff004afb35871fd Mon Sep 17 00:00:00 2001
|
||||
From: no name <git-am@invalid>
|
||||
Date: Sun, 28 Sep 2025 11:33:10 +0200
|
||||
Subject: [PATCH 7/7] d/steamvr_lh: prevent crash on vive pro2/WiVRn
|
||||
Subject: [PATCH 6/6] d/steamvr_lh: prevent crash on vive pro2/WiVRn
|
||||
|
||||
---
|
||||
src/xrt/drivers/steamvr_lh/steamvr_lh.cpp | 2 +-
|
||||
@@ -19,23 +19,17 @@
|
||||
|
||||
#include "accept_connection.h"
|
||||
|
||||
#include "server/ipc_server_interface.h"
|
||||
|
||||
#include "utils/overloaded.h"
|
||||
|
||||
#include "wivrn_config.h"
|
||||
#include "wivrn_ipc.h"
|
||||
#include "wivrn_sockets.h"
|
||||
|
||||
#include <sys/poll.h>
|
||||
|
||||
static void handle_event_from_main_loop(to_monado::disconnect)
|
||||
{
|
||||
// Ignore disconnect request when no headset is connected
|
||||
}
|
||||
|
||||
static void handle_event_from_main_loop(to_monado::set_bitrate)
|
||||
{
|
||||
// Ignore bitrate request when no headset is connected
|
||||
}
|
||||
|
||||
std::unique_ptr<wivrn::TCP> wivrn::accept_connection(int watch_fd, std::function<bool()> quit)
|
||||
std::unique_ptr<wivrn::TCP> wivrn::accept_connection(ipc_server * server, int watch_fd, std::function<bool()> quit)
|
||||
{
|
||||
wivrn_ipc_socket_monado->send(from_monado::headset_disconnected{});
|
||||
|
||||
@@ -68,7 +62,15 @@ std::unique_ptr<wivrn::TCP> wivrn::accept_connection(int watch_fd, std::function
|
||||
{
|
||||
auto packet = receive_from_main();
|
||||
if (packet)
|
||||
std::visit([](auto && x) { handle_event_from_main_loop(x); }, *packet);
|
||||
std::visit(utils::overloaded{
|
||||
[server](to_monado::stop) {
|
||||
ipc_server_stop(server);
|
||||
},
|
||||
[](auto &&) {
|
||||
// Ignore request when no headset is connected
|
||||
},
|
||||
},
|
||||
*packet);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -19,11 +19,13 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "server/ipc_server.h"
|
||||
|
||||
#include <functional>
|
||||
#include <memory>
|
||||
|
||||
namespace wivrn
|
||||
{
|
||||
class TCP;
|
||||
std::unique_ptr<wivrn::TCP> accept_connection(int watch_fd, std::function<bool()> quit = std::function<bool()>());
|
||||
std::unique_ptr<wivrn::TCP> accept_connection(ipc_server * server, int watch_fd, std::function<bool()> quit = std::function<bool()>());
|
||||
} // namespace wivrn
|
||||
@@ -34,6 +34,11 @@
|
||||
|
||||
using namespace std::chrono_literals;
|
||||
|
||||
static void handle_event_from_main_loop(to_monado::stop)
|
||||
{
|
||||
// Ignore stop request when no headset is connected
|
||||
}
|
||||
|
||||
static void handle_event_from_main_loop(to_monado::disconnect)
|
||||
{
|
||||
// Ignore disconnect request when no headset is connected
|
||||
|
||||
@@ -891,6 +891,12 @@ void wivrn_session::operator()(audio_data && data)
|
||||
audio_handle->process_mic_data(std::move(data));
|
||||
}
|
||||
|
||||
void wivrn_session::operator()(to_monado::stop &&)
|
||||
{
|
||||
assert(mnd_ipc_server);
|
||||
ipc_server_stop(mnd_ipc_server);
|
||||
}
|
||||
|
||||
void wivrn_session::operator()(to_monado::disconnect &&)
|
||||
{
|
||||
connection->shutdown();
|
||||
@@ -1007,6 +1013,7 @@ static bool quit_if_no_client(u_system & xrt_system)
|
||||
|
||||
void wivrn_session::reconnect()
|
||||
{
|
||||
assert(mnd_ipc_server);
|
||||
// Notify clients about disconnected status
|
||||
xrt_session_event event{
|
||||
.state = {
|
||||
@@ -1022,7 +1029,7 @@ void wivrn_session::reconnect()
|
||||
}
|
||||
|
||||
U_LOG_I("Waiting for new connection");
|
||||
auto tcp = accept_connection(0 /*stdin*/, [this]() { return quit_if_no_client(xrt_system); });
|
||||
auto tcp = accept_connection(mnd_ipc_server, 0 /*stdin*/, [this]() { return quit_if_no_client(xrt_system); });
|
||||
if (not tcp)
|
||||
exit(0);
|
||||
|
||||
|
||||
@@ -208,6 +208,7 @@ public:
|
||||
void operator()(const from_headset::stop_application &);
|
||||
void operator()(audio_data &&);
|
||||
|
||||
void operator()(to_monado::stop &&);
|
||||
void operator()(to_monado::disconnect &&);
|
||||
void operator()(to_monado::set_bitrate &&);
|
||||
|
||||
|
||||
+2
-21
@@ -178,7 +178,6 @@ static std::string steam_command()
|
||||
|
||||
namespace
|
||||
{
|
||||
int stdin_pipe_fds[2];
|
||||
int control_pipe_fds[2];
|
||||
|
||||
GMainLoop * main_loop;
|
||||
@@ -238,13 +237,7 @@ void start_server(configuration config)
|
||||
}
|
||||
else if (server_pid == 0)
|
||||
{
|
||||
if (do_fork)
|
||||
{
|
||||
// Redirect stdin
|
||||
dup2(stdin_pipe_fds[0], 0);
|
||||
close(stdin_pipe_fds[0]);
|
||||
close(stdin_pipe_fds[1]);
|
||||
}
|
||||
setenv("XRT_NO_STDIN", "1", true);
|
||||
|
||||
// foveation code does not allow oversampling
|
||||
setenv("XRT_COMPOSITOR_SCALE_PERCENTAGE", "100", true);
|
||||
@@ -302,10 +295,7 @@ void start_server(configuration config)
|
||||
|
||||
void kill_server()
|
||||
{
|
||||
// Write to the server's stdin to make it quit
|
||||
char buffer[] = "\n";
|
||||
if (write(stdin_pipe_fds[1], &buffer, strlen(buffer)) < 0)
|
||||
std::cerr << "Cannot stop monado properly." << std::endl;
|
||||
wivrn_ipc_socket_main_loop->send(to_monado::stop{});
|
||||
|
||||
// Send SIGTERM after 1s if it is still running
|
||||
server_kill_watch = g_timeout_add(1000, [](void *) {
|
||||
@@ -917,15 +907,6 @@ int inner_main(int argc, char * argv[], bool show_instructions)
|
||||
AvahiGLibPoll * glib_poll = avahi_glib_poll_new(main_context, G_PRIORITY_DEFAULT);
|
||||
poll_api = avahi_glib_poll_get(glib_poll);
|
||||
|
||||
// Create a pipe to quit monado properly
|
||||
if (pipe(stdin_pipe_fds) < 0)
|
||||
{
|
||||
perror("pipe");
|
||||
return wivrn_exit_code::cannot_create_pipe;
|
||||
}
|
||||
fcntl(stdin_pipe_fds[0], F_SETFD, FD_CLOEXEC);
|
||||
fcntl(stdin_pipe_fds[1], F_SETFD, FD_CLOEXEC);
|
||||
|
||||
// Create a socket to report monado status to the main loop
|
||||
if (socketpair(AF_UNIX, SOCK_DGRAM, 0, control_pipe_fds) < 0)
|
||||
{
|
||||
|
||||
+4
-1
@@ -64,6 +64,9 @@ using packets = std::variant<
|
||||
|
||||
namespace to_monado
|
||||
{
|
||||
struct stop
|
||||
{};
|
||||
|
||||
struct disconnect
|
||||
{};
|
||||
|
||||
@@ -72,7 +75,7 @@ struct set_bitrate
|
||||
uint32_t bitrate_bps;
|
||||
};
|
||||
|
||||
using packets = std::variant<disconnect, set_bitrate>;
|
||||
using packets = std::variant<stop, disconnect, set_bitrate>;
|
||||
} // namespace to_monado
|
||||
|
||||
extern std::optional<wivrn::typed_socket<wivrn::UnixDatagram, to_monado::packets, from_monado::packets>> wivrn_ipc_socket_monado;
|
||||
|
||||
Reference in new issue
Block a user