mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-16 08:09:41 +00:00
Code Issues Releases Wiki Activity

Some refactoring of openxrswapchain

Browse source
This commit is contained in:
Mads Buvik Sandvei 2020-06-02 22:16:42 +02:00
parent 8f38f0536c
commit 31336aba79
2 changed files with 88 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

91
apps/openmw/mwvr/openxrswapchain.cpp
View file

@ -28,7 +28,15 @@ namespace MWVR {
~OpenXRSwapchainImpl();
void beginFrame(osg::GraphicsContext* gc);
int endFrame(osg::GraphicsContext* gc);
void endFrame(osg::GraphicsContext* gc);
void acquire(osg::GraphicsContext* gc);
void release(osg::GraphicsContext* gc);
VRTexture* renderBuffer() const;
uint32_t acquiredImage() const;
bool isAcquired() const;
XrSwapchain mSwapchain = XR_NULL_HANDLE;
std::vector<XrSwapchainImageOpenGLKHR> mSwapchainImageBuffers{};
@ -39,7 +47,10 @@ namespace MWVR {
int32_t mSamples = -1;
int64_t mSwapchainColorFormat = -1;
uint32_t mFBO = 0;
VRTexture* mRenderBuffer = nullptr;
std::vector<std::unique_ptr<VRTexture> > mRenderBuffers{};
int mRenderBuffer{ 0 };
uint32_t mAcquiredImageIndex{ 0 };
bool mIsAcquired{ false };
};
OpenXRSwapchainImpl::OpenXRSwapchainImpl(osg::ref_ptr<osg::State> state, OpenXRSwapchain::Config config)
@ -98,7 +109,8 @@ namespace MWVR {
CHECK_XRCMD(xrEnumerateSwapchainImages(mSwapchain, imageCount, &imageCount, reinterpret_cast<XrSwapchainImageBaseHeader*>(mSwapchainImageBuffers.data())));
//for (const auto& swapchainImage : mSwapchainImageBuffers)
// mTextureBuffers.push_back(new VRTexture(state, swapchainImage.image, mWidth, mHeight, 0));
mRenderBuffer = new VRTexture(state, mWidth, mHeight, 0);
for (unsigned i = 0; i < imageCount; i++)
mRenderBuffers.emplace_back(new VRTexture(state, mWidth, mHeight, 0));
mSubImage.swapchain = mSwapchain;
mSubImage.imageRect.offset = { 0, 0 };
@ -111,31 +123,58 @@ namespace MWVR {
CHECK_XRCMD(xrDestroySwapchain(mSwapchain));
}
VRTexture* OpenXRSwapchainImpl::renderBuffer() const
{
return mRenderBuffers[mRenderBuffer].get();
}
uint32_t OpenXRSwapchainImpl::acquiredImage() const
{
if(isAcquired())
return mSwapchainImageBuffers[mAcquiredImageIndex].image;
throw std::logic_error("Swapbuffer not acquired before use");
}
bool OpenXRSwapchainImpl::isAcquired() const
{
return mIsAcquired;
}
void OpenXRSwapchainImpl::beginFrame(osg::GraphicsContext* gc)
{
mRenderBuffer->beginFrame(gc);
mRenderBuffer = (mRenderBuffer + 1) % mRenderBuffers.size();
renderBuffer()->beginFrame(gc);
}
int swapCount = 0;
int OpenXRSwapchainImpl::endFrame(osg::GraphicsContext* gc)
void OpenXRSwapchainImpl::endFrame(osg::GraphicsContext* gc)
{
Timer timer("Swapchain::endFrame");
// Blit frame to swapchain
acquire(gc);
renderBuffer()->endFrame(gc, acquiredImage());
release(gc);
}
void OpenXRSwapchainImpl::acquire(osg::GraphicsContext* gc)
{
XrSwapchainImageAcquireInfo acquireInfo{ XR_TYPE_SWAPCHAIN_IMAGE_ACQUIRE_INFO };
uint32_t swapchainImageIndex = 0;
CHECK_XRCMD(xrAcquireSwapchainImage(mSwapchain, &acquireInfo, &swapchainImageIndex));
CHECK_XRCMD(xrAcquireSwapchainImage(mSwapchain, &acquireInfo, &mAcquiredImageIndex));
XrSwapchainImageWaitInfo waitInfo{ XR_TYPE_SWAPCHAIN_IMAGE_WAIT_INFO };
waitInfo.timeout = XR_INFINITE_DURATION;
CHECK_XRCMD(xrWaitSwapchainImage(mSwapchain, &waitInfo));
mRenderBuffer->endFrame(gc, mSwapchainImageBuffers[swapchainImageIndex].image);
mIsAcquired = true;
}
void OpenXRSwapchainImpl::release(osg::GraphicsContext* gc)
{
mIsAcquired = false;
XrSwapchainImageReleaseInfo releaseInfo{ XR_TYPE_SWAPCHAIN_IMAGE_RELEASE_INFO };
CHECK_XRCMD(xrReleaseSwapchainImage(mSwapchain, &releaseInfo));
return swapchainImageIndex;
}
OpenXRSwapchain::OpenXRSwapchain(osg::ref_ptr<osg::State> state, OpenXRSwapchain::Config config)
@ -149,37 +188,57 @@ namespace MWVR {
void OpenXRSwapchain::beginFrame(osg::GraphicsContext* gc)
{
impl().beginFrame(gc);
return impl().beginFrame(gc);
}
int OpenXRSwapchain::endFrame(osg::GraphicsContext* gc)
void OpenXRSwapchain::endFrame(osg::GraphicsContext* gc)
{
return impl().endFrame(gc);
}
void OpenXRSwapchain::acquire(osg::GraphicsContext* gc)
{
return impl().acquire(gc);
}
void OpenXRSwapchain::release(osg::GraphicsContext* gc)
{
return impl().release(gc);
}
const XrSwapchainSubImage&
OpenXRSwapchain::subImage(void) const
{
return impl().mSubImage;
}
int OpenXRSwapchain::width()
uint32_t OpenXRSwapchain::acquiredImage() const
{
return impl().acquiredImage();
}
int OpenXRSwapchain::width() const
{
return impl().mWidth;
}
int OpenXRSwapchain::height()
int OpenXRSwapchain::height() const
{
return impl().mHeight;
}
int OpenXRSwapchain::samples()
int OpenXRSwapchain::samples() const
{
return impl().mSamples;
}
VRTexture* OpenXRSwapchain::renderBuffer()
bool OpenXRSwapchain::isAcquired() const
{
return impl().mRenderBuffer;
return impl().isAcquired();
}
VRTexture* OpenXRSwapchain::renderBuffer() const
{
return impl().renderBuffer();
}
}

18
apps/openmw/mwvr/openxrswapchain.hpp
View file

@ -28,17 +28,25 @@ namespace MWVR
//! Prepare for render (set FBO)
void beginFrame(osg::GraphicsContext* gc);
//! Finalize render
int endFrame(osg::GraphicsContext* gc);
void endFrame(osg::GraphicsContext* gc);
//! Prepare for render
void acquire(osg::GraphicsContext* gc);
//! Finalize render
void release(osg::GraphicsContext* gc);
//! Get the view surface
const XrSwapchainSubImage& subImage(void) const;
//! Currently acquired image
uint32_t acquiredImage() const;
//! Whether subchain is currently acquired (true) or released (false)
bool isAcquired() const;
//! Width of the view surface
int width();
int width() const;
//! Height of the view surface
int height();
int height() const;
//! Samples of the view surface
int samples();
int samples() const;
//! Get the current texture
VRTexture* renderBuffer();
VRTexture* renderBuffer() const;
//! Get the private implementation
OpenXRSwapchainImpl& impl() { return *mPrivate; }
//! Get the private implementation