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

xrt: Add hz suffix, follow code style and add limit to refresh rate array

Browse source
This commit is contained in:
Zhongwang Zhang 2023-04-18 14:25:03 +08:00 committed by Jakob Bornecrantz
parent dbfc322e41
commit f84bef916f
6 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/xrt/compositor/main/comp_compositor.c
View file

@ -1078,8 +1078,8 @@ comp_main_create_system_compositor(struct xrt_device *xdev,
//! @todo: Query all supported refresh rates of the current mode //! @todo: Query all supported refresh rates of the current mode
sys_info->num_refresh_rates = 1; sys_info->refresh_rate_count = 1;
sys_info->refresh_rates[0] = (float)(1. / time_ns_to_s(c->settings.nominal_frame_interval_ns)); sys_info->refresh_rates_hz[0] = (float)(1. / time_ns_to_s(c->settings.nominal_frame_interval_ns));
// Needs to be delayed until after compositor's u_var has been setup. // Needs to be delayed until after compositor's u_var has been setup.
if (!c->deferred_surface) { if (!c->deferred_surface) {

4
src/xrt/compositor/null/null_compositor.c
View file

@ -291,8 +291,8 @@ compositor_init_sys_info(struct null_compositor *c, struct xrt_device *xdev)
sys_info->supported_blend_mode_count = (uint8_t)xdev->hmd->blend_mode_count; sys_info->supported_blend_mode_count = (uint8_t)xdev->hmd->blend_mode_count;
// Refresh rates. // Refresh rates.
sys_info->num_refresh_rates = 1; sys_info->refresh_rate_count = 1;
sys_info->refresh_rates[0] = (float)(1. / time_ns_to_s(c->settings.frame_interval_ns)); sys_info->refresh_rates_hz[0] = (float)(1. / time_ns_to_s(c->settings.frame_interval_ns));
return true; return true;
} }

4
src/xrt/include/xrt/xrt_compositor.h
View file

@ -2086,8 +2086,8 @@ struct xrt_system_compositor_info
//! Number of meaningful elements in xrt_system_compositor_info::supported_blend_modes //! Number of meaningful elements in xrt_system_compositor_info::supported_blend_modes
uint8_t supported_blend_mode_count; uint8_t supported_blend_mode_count;
uint32_t num_refresh_rates; uint32_t refresh_rate_count;
float refresh_rates[1]; float refresh_rates_hz[XRT_MAX_SUPPORTED_REFRESH_RATES];
//! The vk device as used by the compositor, never changes. //! The vk device as used by the compositor, never changes.
xrt_uuid_t compositor_vk_deviceUUID; xrt_uuid_t compositor_vk_deviceUUID;

5
src/xrt/include/xrt/xrt_limits.h
View file

@ -39,6 +39,11 @@
*/ */
#define XRT_MAX_SWAPCHAIN_CREATE_INFO_FORMAT_LIST_COUNT 8 #define XRT_MAX_SWAPCHAIN_CREATE_INFO_FORMAT_LIST_COUNT 8
/*!
* Max number of supported display refresh rates, artificial limit.
*/
#define XRT_MAX_SUPPORTED_REFRESH_RATES 16
/*! /*!
* @} * @}
*/ */

7
src/xrt/state_trackers/oxr/oxr_api_session.c
View file

@ -577,7 +577,8 @@ oxr_xrEnumerateDisplayRefreshRatesFB(XrSession session,
} }
OXR_TWO_CALL_HELPER(&log, displayRefreshRateCapacityInput, displayRefreshRateCountOutput, displayRefreshRates, OXR_TWO_CALL_HELPER(&log, displayRefreshRateCapacityInput, displayRefreshRateCountOutput, displayRefreshRates,
sess->sys->xsysc->info.num_refresh_rates, sess->sys->xsysc->info.refresh_rates, XR_SUCCESS); sess->sys->xsysc->info.refresh_rate_count, sess->sys->xsysc->info.refresh_rates_hz,
XR_SUCCESS);
} }
XRAPI_ATTR XrResult XRAPI_CALL XRAPI_ATTR XrResult XRAPI_CALL
@ -594,11 +595,11 @@ oxr_xrGetDisplayRefreshRateFB(XrSession session, float *displayRefreshRate)
return XR_SUCCESS; return XR_SUCCESS;
} }
if (sess->sys->xsysc->info.num_refresh_rates < 1) { if (sess->sys->xsysc->info.refresh_rate_count < 1) {
return XR_ERROR_RUNTIME_FAILURE; return XR_ERROR_RUNTIME_FAILURE;
} }
*displayRefreshRate = sess->sys->xsysc->info.refresh_rates[0]; *displayRefreshRate = sess->sys->xsysc->info.refresh_rates_hz[0];
return XR_SUCCESS; return XR_SUCCESS;
} }

4
src/xrt/targets/sdl_test/sdl_compositor.c
View file

@ -299,8 +299,8 @@ compositor_init_sys_info(struct sdl_compositor *c, struct sdl_program *sp, struc
sys_info->supported_blend_mode_count = (uint8_t)xdev->hmd->blend_mode_count; sys_info->supported_blend_mode_count = (uint8_t)xdev->hmd->blend_mode_count;
// Refresh rates. // Refresh rates.
sys_info->num_refresh_rates = 1; sys_info->refresh_rate_count = 1;
sys_info->refresh_rates[0] = (float)(1. / time_ns_to_s(c->settings.frame_interval_ns)); sys_info->refresh_rates_hz[0] = (float)(1. / time_ns_to_s(c->settings.frame_interval_ns));
return true; return true;
} }