diff --git a/src/xrt/state_trackers/oxr/oxr_objects.h b/src/xrt/state_trackers/oxr/oxr_objects.h index 924a9909d..c42e03f73 100644 --- a/src/xrt/state_trackers/oxr/oxr_objects.h +++ b/src/xrt/state_trackers/oxr/oxr_objects.h @@ -803,11 +803,22 @@ oxr_swapchain_to_openxr(struct oxr_swapchain *sc) return XRT_CAST_PTR_TO_OXR_HANDLE(XrSwapchain, sc); } +/*! + * Shared create function for swapchains, called by grahpics API specific + * implementations list below. Does most init, but not @ref xrt_swapchain + * allocation and other API specific things. + * + * @param log Logger set with the current OpenXR function call context. + * @param sess OpenXR session + * @param createInfo Creation info. + * @param sc Swapchain. + * @param[out] out_swapchain Return of the allocated swapchain. + */ XrResult -oxr_create_swapchain(struct oxr_logger * /*log*/, - struct oxr_session *sess, - const XrSwapchainCreateInfo * /*createInfo*/, - struct oxr_swapchain **out_swapchain); +oxr_swapchain_common_create(struct oxr_logger *log, + struct oxr_session *sess, + const XrSwapchainCreateInfo *createInfo, + struct oxr_swapchain **out_swapchain); /* diff --git a/src/xrt/state_trackers/oxr/oxr_swapchain.c b/src/xrt/state_trackers/oxr/oxr_swapchain.c index e95360e59..96921267c 100644 --- a/src/xrt/state_trackers/oxr/oxr_swapchain.c +++ b/src/xrt/state_trackers/oxr/oxr_swapchain.c @@ -219,10 +219,10 @@ destroy_handle(struct oxr_logger *log, struct oxr_handle_base *hb) */ XrResult -oxr_create_swapchain(struct oxr_logger *log, - struct oxr_session *sess, - const XrSwapchainCreateInfo *createInfo, - struct oxr_swapchain **out_swapchain) +oxr_swapchain_common_create(struct oxr_logger *log, + struct oxr_session *sess, + const XrSwapchainCreateInfo *createInfo, + struct oxr_swapchain **out_swapchain) { xrt_result_t xret = XRT_SUCCESS; diff --git a/src/xrt/state_trackers/oxr/oxr_swapchain_d3d11.c b/src/xrt/state_trackers/oxr/oxr_swapchain_d3d11.c index d9422455d..16c6ed3fe 100644 --- a/src/xrt/state_trackers/oxr/oxr_swapchain_d3d11.c +++ b/src/xrt/state_trackers/oxr/oxr_swapchain_d3d11.c @@ -43,7 +43,7 @@ oxr_swapchain_d3d11_create(struct oxr_logger *log, struct oxr_swapchain *sc; XrResult ret; - ret = oxr_create_swapchain(log, sess, createInfo, &sc); + ret = oxr_swapchain_common_create(log, sess, createInfo, &sc); if (ret != XR_SUCCESS) { return ret; } diff --git a/src/xrt/state_trackers/oxr/oxr_swapchain_d3d12.c b/src/xrt/state_trackers/oxr/oxr_swapchain_d3d12.c index f41204a71..56974f61e 100644 --- a/src/xrt/state_trackers/oxr/oxr_swapchain_d3d12.c +++ b/src/xrt/state_trackers/oxr/oxr_swapchain_d3d12.c @@ -51,7 +51,7 @@ oxr_swapchain_d3d12_create(struct oxr_logger *log, XR_SWAPCHAIN_USAGE_UNORDERED_ACCESS_BIT, XR_SWAPCHAIN_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT); - ret = oxr_create_swapchain(log, sess, createInfo, &sc); + ret = oxr_swapchain_common_create(log, sess, createInfo, &sc); if (ret != XR_SUCCESS) { return ret; } diff --git a/src/xrt/state_trackers/oxr/oxr_swapchain_gl.c b/src/xrt/state_trackers/oxr/oxr_swapchain_gl.c index 6c4eb3c5f..3c275849f 100644 --- a/src/xrt/state_trackers/oxr/oxr_swapchain_gl.c +++ b/src/xrt/state_trackers/oxr/oxr_swapchain_gl.c @@ -88,7 +88,7 @@ oxr_swapchain_gl_create(struct oxr_logger *log, struct oxr_swapchain *sc; XrResult ret; - ret = oxr_create_swapchain(log, sess, createInfo, &sc); + ret = oxr_swapchain_common_create(log, sess, createInfo, &sc); if (ret != XR_SUCCESS) { return ret; } diff --git a/src/xrt/state_trackers/oxr/oxr_swapchain_vk.c b/src/xrt/state_trackers/oxr/oxr_swapchain_vk.c index d07876215..6db4e2f83 100644 --- a/src/xrt/state_trackers/oxr/oxr_swapchain_vk.c +++ b/src/xrt/state_trackers/oxr/oxr_swapchain_vk.c @@ -41,7 +41,7 @@ oxr_swapchain_vk_create(struct oxr_logger *log, struct oxr_swapchain *sc; XrResult ret; - ret = oxr_create_swapchain(log, sess, createInfo, &sc); + ret = oxr_swapchain_common_create(log, sess, createInfo, &sc); if (ret != XR_SUCCESS) { return ret; }