mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-03-07 07:06:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ipc: don't drop the blend mode on the floor

Browse source
This commit is contained in:
Moses Turner 2021-02-19 14:31:25 -06:00
parent 3162f8050c
commit daff282946
3 changed files with 4 additions and 3 deletions

4
src/xrt/ipc/client/ipc_client_hmd.c
View file

@ -170,15 +170,13 @@ ipc_client_hmd_create(struct ipc_connection *ipc_c, struct xrt_tracking_origin *
} }
#endif #endif
// clang-foramt off ich->base.hmd->blend_mode = ipc_c->ism->hmd.blend_mode;
ich->base.hmd->blend_mode = XRT_BLEND_MODE_OPAQUE;
ich->base.hmd->views[0].display.w_pixels = ipc_c->ism->hmd.views[0].display.w_pixels; ich->base.hmd->views[0].display.w_pixels = ipc_c->ism->hmd.views[0].display.w_pixels;
ich->base.hmd->views[0].display.h_pixels = ipc_c->ism->hmd.views[0].display.h_pixels; ich->base.hmd->views[0].display.h_pixels = ipc_c->ism->hmd.views[0].display.h_pixels;
ich->base.hmd->views[0].fov = ipc_c->ism->hmd.views[0].fov; ich->base.hmd->views[0].fov = ipc_c->ism->hmd.views[0].fov;
ich->base.hmd->views[1].display.w_pixels = ipc_c->ism->hmd.views[1].display.w_pixels; ich->base.hmd->views[1].display.w_pixels = ipc_c->ism->hmd.views[1].display.w_pixels;
ich->base.hmd->views[1].display.h_pixels = ipc_c->ism->hmd.views[1].display.h_pixels; ich->base.hmd->views[1].display.h_pixels = ipc_c->ism->hmd.views[1].display.h_pixels;
ich->base.hmd->views[1].fov = ipc_c->ism->hmd.views[1].fov; ich->base.hmd->views[1].fov = ipc_c->ism->hmd.views[1].fov;
// clang-foramt on
// Distortion information, fills in xdev->compute_distortion(). // Distortion information, fills in xdev->compute_distortion().
u_distortion_mesh_set_none(&ich->base); u_distortion_mesh_set_none(&ich->base);

2
src/xrt/ipc/server/ipc_server_process.c
View file

@ -264,6 +264,8 @@ init_shm(struct ipc_server *s)
ism->hmd.views[1].display.w_pixels = xdev->hmd->views[1].display.w_pixels; ism->hmd.views[1].display.w_pixels = xdev->hmd->views[1].display.w_pixels;
ism->hmd.views[1].display.h_pixels = xdev->hmd->views[1].display.h_pixels; ism->hmd.views[1].display.h_pixels = xdev->hmd->views[1].display.h_pixels;
ism->hmd.views[1].fov = xdev->hmd->views[1].fov; ism->hmd.views[1].fov = xdev->hmd->views[1].fov;
ism->hmd.blend_mode = xdev->hmd->blend_mode;
} }
// Setup the tracking origin. // Setup the tracking origin.

1
src/xrt/ipc/shared/ipc_protocol.h
View file

@ -224,6 +224,7 @@ struct ipc_shared_memory
*/ */
struct xrt_fov fov; struct xrt_fov fov;
} views[2]; } views[2];
enum xrt_blend_mode blend_mode;
} hmd; } hmd;
struct xrt_input inputs[IPC_SHARED_MAX_INPUTS]; struct xrt_input inputs[IPC_SHARED_MAX_INPUTS];