Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-14 11:46:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

OpenXrDisplayPlugin: Move swapchain aquire to hmdPresent.

Browse source
This commit is contained in:
Lubosz Sarnecki 2024-03-13 23:23:33 +01:00
parent dfe92064b9
commit 385b33f6d2
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
plugins/openxr/src/OpenXrDisplayPlugin.cpp
View file

@ -405,6 +405,18 @@ void OpenXrDisplayPlugin::compositeLayers() {
}
if (_lastFrameState.shouldRender) {
_compositeFramebuffer->setRenderBuffer(0, _compositeSwapChain[_swapChainIndices[0]]);
HmdDisplayPlugin::compositeLayers();
}
}
void OpenXrDisplayPlugin::hmdPresent() {
if (!_context->_shouldRunFrameCycle) {
return;
}
if (_lastFrameState.shouldRender) {
// TODO: Use multiview swapchain
for (uint32_t i = 0; i < 2; i++) {
XrSwapchainImageAcquireInfo acquireInfo = { .type = XR_TYPE_SWAPCHAIN_IMAGE_ACQUIRE_INFO };
@ -421,18 +433,6 @@ void OpenXrDisplayPlugin::compositeLayers() {
_projectionLayerViews[i].fov = _views[i].fov;
}
_compositeFramebuffer->setRenderBuffer(0, _compositeSwapChain[_swapChainIndices[0]]);
HmdDisplayPlugin::compositeLayers();
}
}
void OpenXrDisplayPlugin::hmdPresent() {
if (!_context->_shouldRunFrameCycle) {
return;
}
if (_lastFrameState.shouldRender) {
GLuint glTexId = getGLBackend()->getTextureID(_compositeFramebuffer->getRenderBuffer(0));
glCopyImageSubData(glTexId, GL_TEXTURE_2D, 0, 0, 0, 0, _images[0][_swapChainIndices[0]].image, GL_TEXTURE_2D, 0, 0, 0,
@ -441,8 +441,6 @@ void OpenXrDisplayPlugin::hmdPresent() {
glCopyImageSubData(glTexId, GL_TEXTURE_2D, 0, _renderTargetSize.x / 2, 0, 0, _images[1][_swapChainIndices[1]].image,
GL_TEXTURE_2D, 0, 0, 0, 0, _renderTargetSize.x / 2, _renderTargetSize.y, 1);
_presentRate.increment();
for (uint32_t i = 0; i < 2; i++) {
XrSwapchainImageReleaseInfo releaseInfo = { .type = XR_TYPE_SWAPCHAIN_IMAGE_RELEASE_INFO };
XrResult result = xrReleaseSwapchainImage(_swapChains[i], &releaseInfo);
@ -453,6 +451,8 @@ void OpenXrDisplayPlugin::hmdPresent() {
}
}
endFrame();
_presentRate.increment();
}
bool OpenXrDisplayPlugin::endFrame() {