diff --git a/client/xr/session.cpp b/client/xr/session.cpp index 2e212935..d26885c0 100644 --- a/client/xr/session.cpp +++ b/client/xr/session.cpp @@ -50,6 +50,13 @@ xr::session::session(xr::instance & inst, xr::system & sys, vk::raii::Instance & }; CHECK_XR(xrCreateSession(inst, &session_info, &id)); + + if (inst.has_extension(XR_FB_DISPLAY_REFRESH_RATE_EXTENSION_NAME)) + { + xrGetDisplayRefreshRateFB = inst.get_proc("xrGetDisplayRefreshRateFB"); + xrEnumerateDisplayRefreshRatesFB = inst.get_proc("xrEnumerateDisplayRefreshRatesFB"); + xrRequestDisplayRefreshRateFB = inst.get_proc("xrRequestDisplayRefreshRateFB"); + } } std::vector xr::session::get_reference_spaces() const @@ -259,7 +266,6 @@ std::vector xr::session::localized_sources_for_action(XrAction acti float xr::session::get_current_refresh_rate() { assert(inst->has_extension(XR_FB_DISPLAY_REFRESH_RATE_EXTENSION_NAME)); - static auto xrGetDisplayRefreshRateFB = inst->get_proc("xrGetDisplayRefreshRateFB"); float refresh_rate = 0; if (xrGetDisplayRefreshRateFB) @@ -270,9 +276,6 @@ float xr::session::get_current_refresh_rate() std::vector xr::session::get_refresh_rates() { - assert(inst->has_extension(XR_FB_DISPLAY_REFRESH_RATE_EXTENSION_NAME)); - static auto xrEnumerateDisplayRefreshRatesFB = inst->get_proc("xrEnumerateDisplayRefreshRatesFB"); - if (xrEnumerateDisplayRefreshRatesFB) { try @@ -290,10 +293,6 @@ std::vector xr::session::get_refresh_rates() void xr::session::set_refresh_rate(float refresh_rate) { - if (not inst->has_extension(XR_FB_DISPLAY_REFRESH_RATE_EXTENSION_NAME)) - return; - static auto xrRequestDisplayRefreshRateFB = inst->get_proc("xrRequestDisplayRefreshRateFB"); - if (xrRequestDisplayRefreshRateFB) { if (auto res = xrRequestDisplayRefreshRateFB(id, refresh_rate); res != XR_SUCCESS) diff --git a/client/xr/session.h b/client/xr/session.h index 0c31684e..a29aad57 100644 --- a/client/xr/session.h +++ b/client/xr/session.h @@ -42,6 +42,10 @@ class session : public utils::handle xr::passthrough passthrough; thread_safe * queue = nullptr; + PFN_xrGetDisplayRefreshRateFB xrGetDisplayRefreshRateFB = nullptr; + PFN_xrEnumerateDisplayRefreshRatesFB xrEnumerateDisplayRefreshRatesFB = nullptr; + PFN_xrRequestDisplayRefreshRateFB xrRequestDisplayRefreshRateFB = nullptr; + public: session() = default; session(instance &, system &, vk::raii::Instance &, vk::raii::PhysicalDevice &, vk::raii::Device &, thread_safe & queue, int queue_family_index);