+2 -2

src/xrt/compositor/main/comp_compositor.c

reviewed

··· 1078 1078 1079 1079 1080 1080 //! @todo: Query all supported refresh rates of the current mode 1081 1081 - sys_info->num_refresh_rates = 1; 1082 1082 - sys_info->refresh_rates[0] = (float)(1. / time_ns_to_s(c->settings.nominal_frame_interval_ns)); 1081 1081 + sys_info->refresh_rate_count = 1; 1082 1082 + sys_info->refresh_rates_hz[0] = (float)(1. / time_ns_to_s(c->settings.nominal_frame_interval_ns)); 1083 1083 1084 1084 // Needs to be delayed until after compositor's u_var has been setup. 1085 1085 if (!c->deferred_surface) {

+2 -2

src/xrt/compositor/null/null_compositor.c

reviewed

··· 291 291 sys_info->supported_blend_mode_count = (uint8_t)xdev->hmd->blend_mode_count; 292 292 293 293 // Refresh rates. 294 294 - sys_info->num_refresh_rates = 1; 295 295 - sys_info->refresh_rates[0] = (float)(1. / time_ns_to_s(c->settings.frame_interval_ns)); 294 294 + sys_info->refresh_rate_count = 1; 295 295 + sys_info->refresh_rates_hz[0] = (float)(1. / time_ns_to_s(c->settings.frame_interval_ns)); 296 296 297 297 return true; 298 298 }

+2 -2

src/xrt/include/xrt/xrt_compositor.h

reviewed

··· 2086 2086 //! Number of meaningful elements in xrt_system_compositor_info::supported_blend_modes 2087 2087 uint8_t supported_blend_mode_count; 2088 2088 2089 2089 - uint32_t num_refresh_rates; 2090 2090 - float refresh_rates[1]; 2089 2089 + uint32_t refresh_rate_count; 2090 2090 + float refresh_rates_hz[XRT_MAX_SUPPORTED_REFRESH_RATES]; 2091 2091 2092 2092 //! The vk device as used by the compositor, never changes. 2093 2093 xrt_uuid_t compositor_vk_deviceUUID;

+5

src/xrt/include/xrt/xrt_limits.h

reviewed

··· 40 40 #define XRT_MAX_SWAPCHAIN_CREATE_INFO_FORMAT_LIST_COUNT 8 41 41 42 42 /*! 43 43 + * Max number of supported display refresh rates, artificial limit. 44 44 + */ 45 45 + #define XRT_MAX_SUPPORTED_REFRESH_RATES 16 46 46 + 47 47 + /*! 43 48 * @} 44 49 */

+4 -3

src/xrt/state_trackers/oxr/oxr_api_session.c

reviewed

··· 577 577 } 578 578 579 579 OXR_TWO_CALL_HELPER(&log, displayRefreshRateCapacityInput, displayRefreshRateCountOutput, displayRefreshRates, 580 580 - sess->sys->xsysc->info.num_refresh_rates, sess->sys->xsysc->info.refresh_rates, XR_SUCCESS); 580 580 + sess->sys->xsysc->info.refresh_rate_count, sess->sys->xsysc->info.refresh_rates_hz, 581 581 + XR_SUCCESS); 581 582 } 582 583 583 584 XRAPI_ATTR XrResult XRAPI_CALL ··· 594 595 return XR_SUCCESS; 595 596 } 596 597 597 597 - if (sess->sys->xsysc->info.num_refresh_rates < 1) { 598 598 + if (sess->sys->xsysc->info.refresh_rate_count < 1) { 598 599 return XR_ERROR_RUNTIME_FAILURE; 599 600 } 600 601 601 601 - *displayRefreshRate = sess->sys->xsysc->info.refresh_rates[0]; 602 602 + *displayRefreshRate = sess->sys->xsysc->info.refresh_rates_hz[0]; 602 603 return XR_SUCCESS; 603 604 } 604 605

+2 -2

src/xrt/targets/sdl_test/sdl_compositor.c

reviewed

··· 299 299 sys_info->supported_blend_mode_count = (uint8_t)xdev->hmd->blend_mode_count; 300 300 301 301 // Refresh rates. 302 302 - sys_info->num_refresh_rates = 1; 303 303 - sys_info->refresh_rates[0] = (float)(1. / time_ns_to_s(c->settings.frame_interval_ns)); 302 302 + sys_info->refresh_rate_count = 1; 303 303 + sys_info->refresh_rates_hz[0] = (float)(1. / time_ns_to_s(c->settings.frame_interval_ns)); 304 304 305 305 return true; 306 306 }