mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2025-01-19 21:28:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

st/oxr: Populate oxr_system's blend modes list from the system compositor, not the device.

Browse source
This commit is contained in:
Ryan Pavlik 2021-11-08 13:57:51 -06:00 committed by Moses Turner
parent 201765d3a7
commit b180b244e3
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/xrt/state_trackers/oxr/oxr_system.c
View file

@ -154,18 +154,14 @@ oxr_system_fill_in(struct oxr_logger *log, struct oxr_instance *inst, XrSystemId
sys->views[1].maxSwapchainSampleCount = info->views[1].max.sample_count;
// clang-format on
struct xrt_device *head = GET_XDEV_BY_ROLE(sys, head);
assert(info->num_supported_blend_modes <= ARRAY_SIZE(sys->blend_modes));
assert(info->num_supported_blend_modes != 0);
assert(head->hmd->num_blend_modes <= XRT_MAX_DEVICE_BLEND_MODES);
assert(head->hmd->num_blend_modes != 0);
for (size_t i = 0; i < head->hmd->num_blend_modes; i++) {
assert(u_verify_blend_mode_valid(head->hmd->blend_modes[i]));
sys->blend_modes[i] = (XrEnvironmentBlendMode)head->hmd->blend_modes[i];
for (uint8_t i = 0; i < info->num_supported_blend_modes; i++) {
assert(u_verify_blend_mode_valid(info->supported_blend_modes[i]));
sys->blend_modes[i] = (XrEnvironmentBlendMode)info->supported_blend_modes[i];
}
sys->num_blend_modes = (uint32_t)head->hmd->num_blend_modes;
assert(sys->num_blend_modes <= ARRAY_SIZE(sys->blend_modes));
sys->num_blend_modes = (uint32_t)info->num_supported_blend_modes;
return XR_SUCCESS;
}