From c9ad5ad3b73ff60e9a40173b1ae49e67800a4b72 Mon Sep 17 00:00:00 2001 From: Kristoffer Skau Date: Tue, 25 Oct 2022 22:30:15 +0200 Subject: Add support for stereoscopic content in QRhi::OpenGLES2 Setting the flag QSurfaceFormat::StereoBuffers does not actually do anything, because we do not utilize the extra buffers provided. We need to expose setting the correct buffers using glDrawBuffers between draw calls. Change-Id: I6a5110405e621030ac3a2886fa83df0cfe928723 Reviewed-by: Laszlo Agocs --- tests/manual/rhi/CMakeLists.txt | 1 + tests/manual/rhi/stereo/CMakeLists.txt | 40 +++++ tests/manual/rhi/stereo/main.cpp | 36 +++++ tests/manual/rhi/stereo/stereo.pro | 12 ++ tests/manual/rhi/stereo/stereo.qrc | 6 + tests/manual/rhi/stereo/window.cpp | 264 +++++++++++++++++++++++++++++++++ tests/manual/rhi/stereo/window.h | 56 +++++++ 7 files changed, 415 insertions(+) create mode 100644 tests/manual/rhi/stereo/CMakeLists.txt create mode 100644 tests/manual/rhi/stereo/main.cpp create mode 100644 tests/manual/rhi/stereo/stereo.pro create mode 100644 tests/manual/rhi/stereo/stereo.qrc create mode 100644 tests/manual/rhi/stereo/window.cpp create mode 100644 tests/manual/rhi/stereo/window.h (limited to 'tests/manual') diff --git a/tests/manual/rhi/CMakeLists.txt b/tests/manual/rhi/CMakeLists.txt index c160a78aff..1ad52f548c 100644 --- a/tests/manual/rhi/CMakeLists.txt +++ b/tests/manual/rhi/CMakeLists.txt @@ -30,6 +30,7 @@ add_subdirectory(polygonmode) add_subdirectory(tessellation) add_subdirectory(geometryshader) add_subdirectory(stenciloutline) +add_subdirectory(stereo) if(QT_FEATURE_widgets) add_subdirectory(rhiwidget) endif() diff --git a/tests/manual/rhi/stereo/CMakeLists.txt b/tests/manual/rhi/stereo/CMakeLists.txt new file mode 100644 index 0000000000..c6ceeed240 --- /dev/null +++ b/tests/manual/rhi/stereo/CMakeLists.txt @@ -0,0 +1,40 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + +# Generated from stereo.pro. + +##################################################################### +## stereo Binary: +##################################################################### + +qt_internal_add_manual_test(stereo + SOURCES + main.cpp + window.cpp window.h + LIBRARIES + Qt::Gui + Qt::GuiPrivate +) + +# Resources: +set_source_files_properties("../shared/color.frag.qsb" + PROPERTIES QT_RESOURCE_ALIAS "color.frag.qsb" +) +set_source_files_properties("../shared/color.vert.qsb" + PROPERTIES QT_RESOURCE_ALIAS "color.vert.qsb" +) +set(stereo_resource_files + "../shared/color.frag.qsb" + "../shared/color.vert.qsb" +) + +qt_internal_add_resource(stereo "stereo" + PREFIX + "/" + FILES + ${stereo_resource_files} +) + + +#### Keys ignored in scope 1:.:.:stereo.pro:: +# TEMPLATE = "app" diff --git a/tests/manual/rhi/stereo/main.cpp b/tests/manual/rhi/stereo/main.cpp new file mode 100644 index 0000000000..7ab1448217 --- /dev/null +++ b/tests/manual/rhi/stereo/main.cpp @@ -0,0 +1,36 @@ +// Copyright (C) 2022 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + +// This is a demo showing stereoscopic rendering. +// For now, the backend is hardcoded to be OpenGL, because that's the only +// supported backend. + +#include +#include +#include "window.h" + +int main(int argc, char **argv) +{ + QGuiApplication app(argc, argv); + + QSurfaceFormat fmt; + fmt.setDepthBufferSize(24); + fmt.setStencilBufferSize(8); + + // Request stereoscopic rendering support with left/right buffers + fmt.setStereo(true); + + QSurfaceFormat::setDefaultFormat(fmt); + + Window w; + w.resize(1280, 720); + w.setTitle(QCoreApplication::applicationName()); + w.show(); + + int ret = app.exec(); + + if (w.handle()) + w.releaseSwapChain(); + + return ret; +} diff --git a/tests/manual/rhi/stereo/stereo.pro b/tests/manual/rhi/stereo/stereo.pro new file mode 100644 index 0000000000..524c83a7f1 --- /dev/null +++ b/tests/manual/rhi/stereo/stereo.pro @@ -0,0 +1,12 @@ +TEMPLATE = app +CONFIG += console +QT += gui-private + +SOURCES = \ + main.cpp \ + window.cpp + +HEADERS = \ + window.h + +RESOURCES = stereo.qrc diff --git a/tests/manual/rhi/stereo/stereo.qrc b/tests/manual/rhi/stereo/stereo.qrc new file mode 100644 index 0000000000..8cec4fa9ec --- /dev/null +++ b/tests/manual/rhi/stereo/stereo.qrc @@ -0,0 +1,6 @@ + + + ../shared/color.vert.qsb + ../shared/color.frag.qsb + + diff --git a/tests/manual/rhi/stereo/window.cpp b/tests/manual/rhi/stereo/window.cpp new file mode 100644 index 0000000000..23ab726046 --- /dev/null +++ b/tests/manual/rhi/stereo/window.cpp @@ -0,0 +1,264 @@ +// Copyright (C) 2022 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + +#include "window.h" +#include +#include +#include +#include +#include "../shared/cube.h" + +Window::Window() +{ + setSurfaceType(OpenGLSurface); +} + +void Window::exposeEvent(QExposeEvent *) +{ + if (isExposed() && !m_running) { + m_running = true; + init(); + resizeSwapChain(); + } + + const QSize surfaceSize = m_hasSwapChain ? m_sc->surfacePixelSize() : QSize(); + if ((!isExposed() || (m_hasSwapChain && surfaceSize.isEmpty())) && m_running && !m_notExposed) + m_notExposed = true; + + if (isExposed() && m_running && m_notExposed && !surfaceSize.isEmpty()) { + m_notExposed = false; + m_newlyExposed = true; + } + + if (isExposed() && !surfaceSize.isEmpty()) + render(); +} + +bool Window::event(QEvent *e) +{ + switch (e->type()) { + case QEvent::UpdateRequest: + render(); + break; + + case QEvent::PlatformSurface: + if (static_cast(e)->surfaceEventType() == QPlatformSurfaceEvent::SurfaceAboutToBeDestroyed) + releaseSwapChain(); + break; + + default: + break; + } + + return QWindow::event(e); +} + +void Window::init() +{ + QRhi::Flags rhiFlags = QRhi::EnableDebugMarkers | QRhi::EnableProfiling; + + m_fallbackSurface.reset(QRhiGles2InitParams::newFallbackSurface()); + QRhiGles2InitParams params; + params.fallbackSurface = m_fallbackSurface.get(); + params.window = this; + m_rhi.reset(QRhi::create(QRhi::OpenGLES2, ¶ms, rhiFlags)); + + m_sc.reset(m_rhi->newSwapChain()); + m_ds.reset(m_rhi->newRenderBuffer(QRhiRenderBuffer::DepthStencil, + QSize(), + 1, + QRhiRenderBuffer::UsedWithSwapChainOnly)); + m_sc->setWindow(this); + m_sc->setDepthStencil(m_ds.get()); + m_rp.reset(m_sc->newCompatibleRenderPassDescriptor()); + m_sc->setRenderPassDescriptor(m_rp.get()); + + m_vbuf.reset(m_rhi->newBuffer(QRhiBuffer::Immutable, QRhiBuffer::VertexBuffer, sizeof(cube))); + m_vbuf->setName(QByteArrayLiteral("vbuf")); + m_vbuf->create(); + m_vbufReady = false; + + m_ubuf.reset(m_rhi->newBuffer(QRhiBuffer::Dynamic, QRhiBuffer::UniformBuffer, 64 + 4)); + m_ubuf->setName(QByteArrayLiteral("Left eye")); + m_ubuf->create(); + + m_srb.reset(m_rhi->newShaderResourceBindings()); + m_srb->setBindings({ + QRhiShaderResourceBinding::uniformBuffer(0, QRhiShaderResourceBinding::VertexStage | QRhiShaderResourceBinding::FragmentStage, + m_ubuf.get()) + }); + m_srb->create(); + + + m_ubuf2.reset(m_rhi->newBuffer(QRhiBuffer::Dynamic, QRhiBuffer::UniformBuffer, 64 + 4)); + m_ubuf2->setName(QByteArrayLiteral("Right eye")); + m_ubuf2->create(); + + m_srb2.reset(m_rhi->newShaderResourceBindings()); + m_srb2->setBindings({ + QRhiShaderResourceBinding::uniformBuffer(0, QRhiShaderResourceBinding::VertexStage | QRhiShaderResourceBinding::FragmentStage, + m_ubuf2.get()) + }); + m_srb2->create(); + + m_ps.reset(m_rhi->newGraphicsPipeline()); + + QRhiGraphicsPipeline::TargetBlend premulAlphaBlend; + premulAlphaBlend.enable = true; + m_ps->setTargetBlends({ premulAlphaBlend }); + + const QShader vs = getShader(QLatin1String(":/color.vert.qsb")); + if (!vs.isValid()) + qFatal("Failed to load shader pack (vertex)"); + const QShader fs = getShader(QLatin1String(":/color.frag.qsb")); + if (!fs.isValid()) + qFatal("Failed to load shader pack (fragment)"); + + m_ps->setShaderStages({ + { QRhiShaderStage::Vertex, vs }, + { QRhiShaderStage::Fragment, fs } + }); + + QRhiVertexInputLayout inputLayout; + inputLayout.setBindings({ + { 3 * sizeof(float) }, + { 2 * sizeof(float) } + }); + inputLayout.setAttributes({ + { 0, 0, QRhiVertexInputAttribute::Float3, 0 }, + { 1, 1, QRhiVertexInputAttribute::Float2, 0 } + }); + + m_ps->setVertexInputLayout(inputLayout); + m_ps->setShaderResourceBindings(m_srb.get()); + m_ps->setRenderPassDescriptor(m_rp.get()); + + m_ps->create(); + + m_ps->setDepthTest(true); + m_ps->setDepthWrite(true); + m_ps->setDepthOp(QRhiGraphicsPipeline::Less); + + m_ps->setCullMode(QRhiGraphicsPipeline::Back); + m_ps->setFrontFace(QRhiGraphicsPipeline::CCW); +} + +void Window::resizeSwapChain() +{ + m_hasSwapChain = m_sc->createOrResize(); // also handles m_ds + + const QSize outputSize = m_sc->currentPixelSize(); + m_proj = m_rhi->clipSpaceCorrMatrix(); + m_proj.perspective(45.0f, outputSize.width() / (float) outputSize.height(), 0.01f, 1000.0f); + m_proj.translate(0, 0, -4); +} + +void Window::releaseSwapChain() +{ + if (m_hasSwapChain) { + m_hasSwapChain = false; + m_sc->destroy(); + } +} + +void Window::render() +{ + if (!m_hasSwapChain || m_notExposed) + return; + + if (m_sc->currentPixelSize() != m_sc->surfacePixelSize() || m_newlyExposed) { + resizeSwapChain(); + if (!m_hasSwapChain) + return; + m_newlyExposed = false; + } + + QRhi::FrameOpResult r = m_rhi->beginFrame(m_sc.get()); + if (r == QRhi::FrameOpSwapChainOutOfDate) { + resizeSwapChain(); + if (!m_hasSwapChain) + return; + r = m_rhi->beginFrame(m_sc.get()); + } + if (r != QRhi::FrameOpSuccess) { + qDebug("beginFrame failed with %d, retry", r); + requestUpdate(); + return; + } + + recordFrame(); + + m_rhi->endFrame(m_sc.get()); + + QTimer::singleShot(0, this, [this] { render(); }); +} + +QShader Window::getShader(const QString &name) +{ + QFile f(name); + if (f.open(QIODevice::ReadOnly)) + return QShader::fromSerialized(f.readAll()); + + return QShader(); +} + +// called once per frame +void Window::recordFrame() +{ + QRhiResourceUpdateBatch *u = m_rhi->nextResourceUpdateBatch(); + if (!m_vbufReady) { + m_vbufReady = true; + u->uploadStaticBuffer(m_vbuf.get(), cube); + } + + QRhiCommandBuffer *cb = m_sc->currentFrameCommandBuffer(); + const QSize outputSizeInPixels = m_sc->currentPixelSize(); + + const QColor clearColor = QColor::fromRgbF(0.15f, 0.15f, 0.15f, 1.0f); + const QRhiDepthStencilClearValue depthStencil = { 1.0f, 0 }; + const QRhiViewport viewPort = { 0, 0, float(outputSizeInPixels.width()), float(outputSizeInPixels.height()) }; + const QRhiCommandBuffer::VertexInput vbufBindings[] = { + { m_vbuf.get(), 0 }, + { m_vbuf.get(), quint32(36 * 3 * sizeof(float)) } + }; + + QMatrix4x4 mvp = m_rhi->clipSpaceCorrMatrix(); + mvp.perspective(45.0f, outputSizeInPixels.width() / (float) outputSizeInPixels.height(), 0.01f, 100.0f); + + m_translation += m_translationDir * 0.05f; + if (m_translation < -10.0f || m_translation > -5.0f) { + m_translationDir *= -1; + m_translation = qBound(-10.0f, m_translation, -5.0f); + } + mvp.translate(0, 0, m_translation); + m_rotation += .5f; + mvp.rotate(m_rotation, 0, 1, 0); + u->updateDynamicBuffer(m_ubuf.get(), 0, 64, mvp.constData()); + + float opacity = 1.0f; + u->updateDynamicBuffer(m_ubuf.get(), 64, 4, &opacity); + + QMatrix4x4 mvp2 = mvp; + mvp2.translate(-2.f, 0, 0); + + u->updateDynamicBuffer(m_ubuf2.get(), 0, 64, mvp2.constData()); + u->updateDynamicBuffer(m_ubuf2.get(), 64, 4, &opacity); + + cb->resourceUpdate(u); + + cb->beginPass(m_sc->currentFrameRenderTarget(QRhiSwapChain::LeftBuffer), clearColor, depthStencil); + cb->setGraphicsPipeline(m_ps.get()); + cb->setViewport(viewPort); + cb->setShaderResources(m_srb.get()); + cb->setVertexInput(0, 2, vbufBindings); + cb->draw(36); + cb->endPass(); + + cb->beginPass(m_sc->currentFrameRenderTarget(QRhiSwapChain::RightBuffer), clearColor, depthStencil); + cb->setGraphicsPipeline(m_ps.get()); + cb->setViewport(viewPort); + cb->setShaderResources(m_srb2.get()); + cb->setVertexInput(0, 2, vbufBindings); + cb->draw(36); + cb->endPass(); +} diff --git a/tests/manual/rhi/stereo/window.h b/tests/manual/rhi/stereo/window.h new file mode 100644 index 0000000000..28e25dfdb4 --- /dev/null +++ b/tests/manual/rhi/stereo/window.h @@ -0,0 +1,56 @@ +// Copyright (C) 2022 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + +#ifndef WINDOW_H +#define WINDOW_H + +#include +#include +#include + +class Window : public QWindow +{ +public: + Window(); + + void releaseSwapChain(); + +protected: + std::unique_ptr m_fallbackSurface; + std::unique_ptr m_rhi; + std::unique_ptr m_sc; + std::unique_ptr m_ds; + std::unique_ptr m_rp; + + bool m_hasSwapChain = false; + QMatrix4x4 m_proj; + +private: + void init(); + void resizeSwapChain(); + void render(); + void recordFrame(); + + void exposeEvent(QExposeEvent *) override; + bool event(QEvent *) override; + + bool m_running = false; + bool m_notExposed = false; + bool m_newlyExposed = false; + + QShader getShader(const QString &name); + + std::unique_ptr m_vbuf; + bool m_vbufReady = false; + std::unique_ptr m_ubuf; + std::unique_ptr m_ubuf2; + std::unique_ptr m_srb; + std::unique_ptr m_srb2; + std::unique_ptr m_ps; + + float m_rotation = 0; + float m_translation = -5; + int m_translationDir = -1; +}; + +#endif -- cgit v1.2.3