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

st/oxr: Validate that Swapchain has at least one released image

Browse source
This commit is contained in:
Jakob Bornecrantz 2019-06-28 15:55:45 +01:00
parent 35093bee3c
commit 79364eaf4c
1 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/xrt/state_trackers/oxr/oxr_session.c
View file

@ -469,6 +469,29 @@ oxr_session_frame_end(struct oxr_logger *log,
proj->viewCount); proj->viewCount);
} }
// Check for valid swapchain states.
for (uint32_t i = 0; i < proj->viewCount; i++) {
//! @todo More validation?
struct oxr_swapchain *sc =
(struct oxr_swapchain *)proj->views[i].subImage.swapchain;
if (sc->released_index == -1) {
return oxr_error(
log, XR_ERROR_CALL_ORDER_INVALID,
"(frameEndInfo->layers[0]->views[%i].subImage."
"swapchain) Swapchain has not been released!",
i);
}
if (sc->released_index >= (int)sc->swapchain->num_images) {
return oxr_error(
log, XR_ERROR_RUNTIME_FAILURE,
"(frameEndInfo->layers[0]->views[%i].subImage."
"swapchain) Internal image index out of bounds!",
i);
}
}
/* /*
* Doing the real work. * Doing the real work.
@ -480,7 +503,6 @@ oxr_session_frame_end(struct oxr_logger *log,
uint32_t num_chains = ARRAY_SIZE(chains); uint32_t num_chains = ARRAY_SIZE(chains);
for (uint32_t i = 0; i < num_chains; i++) { for (uint32_t i = 0; i < num_chains; i++) {
//! @todo Validate this above.
struct oxr_swapchain *sc = struct oxr_swapchain *sc =
(struct oxr_swapchain *)proj->views[i].subImage.swapchain; (struct oxr_swapchain *)proj->views[i].subImage.swapchain;
chains[i] = sc->swapchain; chains[i] = sc->swapchain;