summaryrefslogtreecommitdiffstats
path: root/src/plugins/renderers/rhi/graphicshelpers/submissioncontext.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/renderers/rhi/graphicshelpers/submissioncontext.cpp')
-rw-r--r--src/plugins/renderers/rhi/graphicshelpers/submissioncontext.cpp1113
1 files changed, 575 insertions, 538 deletions
diff --git a/src/plugins/renderers/rhi/graphicshelpers/submissioncontext.cpp b/src/plugins/renderers/rhi/graphicshelpers/submissioncontext.cpp
index b2999c287..5b217929c 100644
--- a/src/plugins/renderers/rhi/graphicshelpers/submissioncontext.cpp
+++ b/src/plugins/renderers/rhi/graphicshelpers/submissioncontext.cpp
@@ -100,11 +100,11 @@ namespace Qt3DRender {
namespace Render {
namespace Rhi {
-static QHash<unsigned int, SubmissionContext*> static_contexts;
+static QHash<unsigned int, SubmissionContext *> static_contexts;
unsigned int nextFreeContextId() noexcept
{
- for (unsigned int i=0; i < 0xffff; ++i) {
+ for (unsigned int i = 0; i < 0xffff; ++i) {
if (!static_contexts.contains(i))
return i;
}
@@ -129,32 +129,31 @@ RHIBuffer::Type attributeTypeToGLBufferType(QAttribute::AttributeType type) noex
}
}
-void copyGLFramebufferDataToImage(QImage &img, const uchar *srcData, uint stride, uint width, uint height, QAbstractTexture::TextureFormat format) noexcept
+void copyGLFramebufferDataToImage(QImage &img, const uchar *srcData, uint stride, uint width,
+ uint height, QAbstractTexture::TextureFormat format) noexcept
{
switch (format) {
- case QAbstractTexture::RGBA32F:
- {
- uchar *srcScanline = const_cast<uchar *>(srcData) + stride * (height - 1);
- for (uint i = 0; i < height; ++i) {
- uchar *dstScanline = img.scanLine(i);
- float *pSrc = reinterpret_cast<float*>(srcScanline);
- for (uint j = 0; j < width; j++) {
- *dstScanline++ = (uchar)(255.0f * qBound(0.0f, pSrc[4*j+2], 1.0f));
- *dstScanline++ = (uchar)(255.0f * qBound(0.0f, pSrc[4*j+1], 1.0f));
- *dstScanline++ = (uchar)(255.0f * qBound(0.0f, pSrc[4*j+0], 1.0f));
- *dstScanline++ = (uchar)(255.0f * qBound(0.0f, pSrc[4*j+3], 1.0f));
- }
- srcScanline -= stride;
- }
- } break;
- default:
- {
- uchar* srcScanline = (uchar *)srcData + stride * (height - 1);
- for (uint i = 0; i < height; ++i) {
- memcpy(img.scanLine(i), srcScanline, stride);
- srcScanline -= stride;
+ case QAbstractTexture::RGBA32F: {
+ uchar *srcScanline = const_cast<uchar *>(srcData) + stride * (height - 1);
+ for (uint i = 0; i < height; ++i) {
+ uchar *dstScanline = img.scanLine(i);
+ float *pSrc = reinterpret_cast<float *>(srcScanline);
+ for (uint j = 0; j < width; j++) {
+ *dstScanline++ = (uchar)(255.0f * qBound(0.0f, pSrc[4 * j + 2], 1.0f));
+ *dstScanline++ = (uchar)(255.0f * qBound(0.0f, pSrc[4 * j + 1], 1.0f));
+ *dstScanline++ = (uchar)(255.0f * qBound(0.0f, pSrc[4 * j + 0], 1.0f));
+ *dstScanline++ = (uchar)(255.0f * qBound(0.0f, pSrc[4 * j + 3], 1.0f));
}
- } break;
+ srcScanline -= stride;
+ }
+ } break;
+ default: {
+ uchar *srcScanline = (uchar *)srcData + stride * (height - 1);
+ for (uint i = 0; i < height; ++i) {
+ memcpy(img.scanLine(i), srcScanline, stride);
+ srcScanline -= stride;
+ }
+ } break;
}
}
@@ -173,13 +172,13 @@ void applyStateHelper(const BlendEquationArguments *state, QRhiGraphicsPipeline
const auto values = state->values();
// We assume a single color attachment
- QRhiGraphicsPipeline::TargetBlend targetBlend{};
+ QRhiGraphicsPipeline::TargetBlend targetBlend {};
const bool hasTargetBlend = gp->cbeginTargetBlends() != gp->cendTargetBlends();
if (hasTargetBlend)
targetBlend = *(gp->cbeginTargetBlends());
- auto getRHIBlendFactor = [] (int arg) {
+ auto getRHIBlendFactor = [](int arg) {
switch (arg) {
case QBlendEquationArguments::Zero:
return QRhiGraphicsPipeline::Zero;
@@ -189,11 +188,11 @@ void applyStateHelper(const BlendEquationArguments *state, QRhiGraphicsPipeline
return QRhiGraphicsPipeline::SrcColor;
case QBlendEquationArguments::SourceAlpha:
return QRhiGraphicsPipeline::SrcAlpha;
-// ### Qt 6 Fix values
-// case QBlendEquationArguments::Source1Alpha:
-// return QRhiGraphicsPipeline::Src1Alpha;
-// case QBlendEquationArguments::Source1Color:
-// return QRhiGraphicsPipeline::Src1Color;
+ // ### Qt 6 Fix values
+ // case QBlendEquationArguments::Source1Alpha:
+ // return QRhiGraphicsPipeline::Src1Alpha;
+ // case QBlendEquationArguments::Source1Color:
+ // return QRhiGraphicsPipeline::Src1Color;
case QBlendEquationArguments::DestinationColor:
return QRhiGraphicsPipeline::DstColor;
case QBlendEquationArguments::DestinationAlpha:
@@ -230,13 +229,14 @@ void applyStateHelper(const BlendEquationArguments *state, QRhiGraphicsPipeline
targetBlend.dstAlpha = getRHIBlendFactor(std::get<3>(values));
targetBlend.srcColor = getRHIBlendFactor(std::get<0>(values));
targetBlend.dstColor = getRHIBlendFactor(std::get<1>(values));
- gp->setTargetBlends({targetBlend});
+ gp->setTargetBlends({ targetBlend });
}
void applyStateHelper(const BlendEquation *state, QRhiGraphicsPipeline *gp) noexcept
{
const auto values = state->values();
- const QBlendEquation::BlendFunction equation = static_cast<QBlendEquation::BlendFunction>(std::get<0>(values));
+ const QBlendEquation::BlendFunction equation =
+ static_cast<QBlendEquation::BlendFunction>(std::get<0>(values));
// We assume a single color attachment
QRhiGraphicsPipeline::TargetBlend targetBlend;
@@ -245,7 +245,7 @@ void applyStateHelper(const BlendEquation *state, QRhiGraphicsPipeline *gp) noex
if (hasTargetBlend)
targetBlend = *(gp->cbeginTargetBlends());
- auto getRHIBlendOp = [] (QBlendEquation::BlendFunction equation) {
+ auto getRHIBlendOp = [](QBlendEquation::BlendFunction equation) {
switch (equation) {
case QBlendEquation::Add:
return QRhiGraphicsPipeline::Add;
@@ -262,10 +262,11 @@ void applyStateHelper(const BlendEquation *state, QRhiGraphicsPipeline *gp) noex
targetBlend.enable = true;
targetBlend.opAlpha = getRHIBlendOp(equation);
- gp->setTargetBlends({targetBlend});
+ gp->setTargetBlends({ targetBlend });
}
-void applyStateHelper(const MSAAEnabled *state, QRhiGraphicsPipeline *gp, const QSurfaceFormat& format) noexcept
+void applyStateHelper(const MSAAEnabled *state, QRhiGraphicsPipeline *gp,
+ const QSurfaceFormat &format) noexcept
{
gp->setSampleCount(format.samples());
}
@@ -273,7 +274,8 @@ void applyStateHelper(const MSAAEnabled *state, QRhiGraphicsPipeline *gp, const
void applyStateHelper(const DepthTest *state, QRhiGraphicsPipeline *gp) noexcept
{
gp->setDepthTest(true);
- const QDepthTest::DepthFunction depthFunc = static_cast<QDepthTest::DepthFunction>(std::get<0>(state->values()));
+ const QDepthTest::DepthFunction depthFunc =
+ static_cast<QDepthTest::DepthFunction>(std::get<0>(state->values()));
switch (depthFunc) {
case QDepthTest::Never:
gp->setDepthOp(QRhiGraphicsPipeline::Never);
@@ -311,7 +313,8 @@ void applyStateHelper(const NoDepthMask *state, QRhiGraphicsPipeline *gp) noexce
void applyStateHelper(const CullFace *state, QRhiGraphicsPipeline *gp) noexcept
{
const auto values = state->values();
- const QCullFace::CullingMode cullingMode = static_cast<QCullFace::CullingMode>(std::get<0>(values));
+ const QCullFace::CullingMode cullingMode =
+ static_cast<QCullFace::CullingMode>(std::get<0>(values));
switch (cullingMode) {
case QCullFace::NoCulling:
gp->setCullMode(QRhiGraphicsPipeline::None);
@@ -331,7 +334,8 @@ void applyStateHelper(const CullFace *state, QRhiGraphicsPipeline *gp) noexcept
void applyStateHelper(const FrontFace *state, QRhiGraphicsPipeline *gp) noexcept
{
const auto values = state->values();
- const QFrontFace::WindingDirection cullingMode = static_cast<QFrontFace::WindingDirection>(std::get<0>(values));
+ const QFrontFace::WindingDirection cullingMode =
+ static_cast<QFrontFace::WindingDirection>(std::get<0>(values));
switch (cullingMode) {
case QFrontFace::ClockWise:
@@ -348,7 +352,7 @@ void applyStateHelper(const StencilTest *state, QRhiGraphicsPipeline *gp) noexce
const auto values = state->values();
gp->setStencilTest(true);
- auto getCompareOp = [] (int compareOp) {
+ auto getCompareOp = [](int compareOp) {
switch (compareOp) {
case QStencilTestArguments::Never:
return QRhiGraphicsPipeline::Never;
@@ -408,13 +412,13 @@ void applyStateHelper(const ColorMask *state, QRhiGraphicsPipeline *gp) noexcept
colorMask |= QRhiGraphicsPipeline::A;
targetBlend.colorWrite = colorMask;
- gp->setTargetBlends({targetBlend});
+ gp->setTargetBlends({ targetBlend });
}
void applyStateHelper(const StencilOp *state, QRhiGraphicsPipeline *gp) noexcept
{
const auto values = state->values();
- auto getRHIStencilOp = [] (int op) {
+ auto getRHIStencilOp = [](int op) {
switch (op) {
case QStencilOperationArguments::Zero:
return QRhiGraphicsPipeline::StencilZero;
@@ -460,39 +464,45 @@ void applyStateHelper(const StencilMask *state, QRhiGraphicsPipeline *gp) noexce
static QShader::Stage rhiShaderStage(QShaderProgram::ShaderType type) noexcept
{
- switch (type)
- {
- case QShaderProgram::Vertex: return QShader::VertexStage;
- case QShaderProgram::Fragment: return QShader::FragmentStage;
- case QShaderProgram::TessellationControl: return QShader::TessellationControlStage;
- case QShaderProgram::TessellationEvaluation: return QShader::TessellationEvaluationStage;
- case QShaderProgram::Geometry: return QShader::GeometryStage;
- case QShaderProgram::Compute: return QShader::ComputeStage;
- default: std::abort();
+ switch (type) {
+ case QShaderProgram::Vertex:
+ return QShader::VertexStage;
+ case QShaderProgram::Fragment:
+ return QShader::FragmentStage;
+ case QShaderProgram::TessellationControl:
+ return QShader::TessellationControlStage;
+ case QShaderProgram::TessellationEvaluation:
+ return QShader::TessellationEvaluationStage;
+ case QShaderProgram::Geometry:
+ return QShader::GeometryStage;
+ case QShaderProgram::Compute:
+ return QShader::ComputeStage;
+ default:
+ std::abort();
}
}
} // anonymous
-
SubmissionContext::SubmissionContext()
- : m_ownCurrent(true)
- , m_id(nextFreeContextId())
- , m_surface(nullptr)
- , m_activeShader(nullptr)
- , m_renderTargetFormat(QAbstractTexture::NoFormat)
- , m_material(nullptr)
- , m_activeFBO(0)
- , m_renderer(nullptr)
- , m_uboTempArray(QByteArray(1024, 0))
- , m_initialized(false)
- , m_maxTextureUnits(0)
- , m_defaultFBO(0)
- , m_rhi(nullptr)
- , m_currentSwapChain(nullptr)
- , m_currentRenderPassDescriptor(nullptr)
+ : m_ownCurrent(true),
+ m_id(nextFreeContextId()),
+ m_surface(nullptr),
+ m_activeShader(nullptr),
+ m_renderTargetFormat(QAbstractTexture::NoFormat),
+ m_material(nullptr),
+ m_activeFBO(0),
+ m_renderer(nullptr),
+ m_uboTempArray(QByteArray(1024, 0)),
+ m_initialized(false),
+ m_maxTextureUnits(0),
+ m_defaultFBO(0),
+ m_rhi(nullptr),
+ m_currentSwapChain(nullptr),
+ m_currentRenderPassDescriptor(nullptr)
#ifndef QT_NO_OPENGL
- , m_fallbackSurface(nullptr)
+ ,
+ m_fallbackSurface(nullptr)
#endif
{
static_contexts[m_id] = this;
@@ -574,7 +584,7 @@ void SubmissionContext::initialize()
params.fallbackSurface = m_fallbackSurface;
m_rhi = QRhi::create(QRhi::OpenGLES2, &params, rhiFlags);
#else
- qWarning() << "RHI: OpenGL not supported";
+ qWarning() << "RHI: OpenGL not supported";
#endif
}
@@ -585,27 +595,27 @@ void SubmissionContext::resolveRenderTargetFormat()
{
RHI_UNIMPLEMENTED;
-//* const QSurfaceFormat format = m_gl->format();
-//* const uint a = (format.alphaBufferSize() == -1) ? 0 : format.alphaBufferSize();
-//* const uint r = format.redBufferSize();
-//* const uint g = format.greenBufferSize();
-//* const uint b = format.blueBufferSize();
-//*
-//* #define RGBA_BITS(r,g,b,a) (r | (g << 6) | (b << 12) | (a << 18))
-//*
-//* const uint bits = RGBA_BITS(r,g,b,a);
-//* switch (bits) {
-//* case RGBA_BITS(8,8,8,8):
-//* m_renderTargetFormat = QAbstractTexture::RGBA8_UNorm;
-//* break;
-//* case RGBA_BITS(8,8,8,0):
-//* m_renderTargetFormat = QAbstractTexture::RGB8_UNorm;
-//* break;
-//* case RGBA_BITS(5,6,5,0):
-//* m_renderTargetFormat = QAbstractTexture::R5G6B5;
-//* break;
-//* }
-//* #undef RGBA_BITS
+ //* const QSurfaceFormat format = m_gl->format();
+ //* const uint a = (format.alphaBufferSize() == -1) ? 0 : format.alphaBufferSize();
+ //* const uint r = format.redBufferSize();
+ //* const uint g = format.greenBufferSize();
+ //* const uint b = format.blueBufferSize();
+ //*
+ //* #define RGBA_BITS(r,g,b,a) (r | (g << 6) | (b << 12) | (a << 18))
+ //*
+ //* const uint bits = RGBA_BITS(r,g,b,a);
+ //* switch (bits) {
+ //* case RGBA_BITS(8,8,8,8):
+ //* m_renderTargetFormat = QAbstractTexture::RGBA8_UNorm;
+ //* break;
+ //* case RGBA_BITS(8,8,8,0):
+ //* m_renderTargetFormat = QAbstractTexture::RGB8_UNorm;
+ //* break;
+ //* case RGBA_BITS(5,6,5,0):
+ //* m_renderTargetFormat = QAbstractTexture::R5G6B5;
+ //* break;
+ //* }
+ //* #undef RGBA_BITS
}
bool SubmissionContext::beginDrawing(QSurface *surface)
@@ -659,8 +669,7 @@ bool SubmissionContext::beginDrawing(QSurface *surface)
// swapChainInfo->renderBuffer->build();
// Resize swapchain if needed
- if (m_surface->size() != swapChain->surfacePixelSize())
- {
+ if (m_surface->size() != swapChain->surfacePixelSize()) {
bool couldRebuild = swapChain->buildOrResize();
if (!couldRebuild)
return false;
@@ -681,17 +690,18 @@ void SubmissionContext::endDrawing(bool swapBuffers)
m_rhi->endFrame(m_currentSwapChain, {});
RHI_UNIMPLEMENTED;
-//* if (swapBuffers)
-//* m_gl->swapBuffers(m_surface);
-//* if (m_ownCurrent)
-//* m_gl->doneCurrent();
+ //* if (swapBuffers)
+ //* m_gl->swapBuffers(m_surface);
+ //* if (m_ownCurrent)
+ //* m_gl->doneCurrent();
// m_textureContext.endDrawing();
-//* static int i = 0;
-//* if (i++ == 10)
-//* std::exit(0);
+ //* static int i = 0;
+ //* if (i++ == 10)
+ //* std::exit(0);
}
-void SubmissionContext::activateRenderTarget(Qt3DCore::QNodeId renderTargetNodeId, const AttachmentPack &attachments, GLuint defaultFboId)
+void SubmissionContext::activateRenderTarget(Qt3DCore::QNodeId renderTargetNodeId,
+ const AttachmentPack &attachments, GLuint defaultFboId)
{
RHI_UNIMPLEMENTED;
GLuint fboId = defaultFboId; // Default FBO
@@ -712,247 +722,262 @@ void SubmissionContext::activateRenderTarget(Qt3DCore::QNodeId renderTargetNodeI
}
}
m_activeFBO = fboId;
-//* m_glHelper->bindFrameBufferObject(m_activeFBO, GraphicsHelperInterface::FBODraw);
+ //* m_glHelper->bindFrameBufferObject(m_activeFBO, GraphicsHelperInterface::FBODraw);
// Set active drawBuffers
activateDrawBuffers(attachments);
}
-GLuint SubmissionContext::createRenderTarget(Qt3DCore::QNodeId renderTargetNodeId, const AttachmentPack &attachments)
+GLuint SubmissionContext::createRenderTarget(Qt3DCore::QNodeId renderTargetNodeId,
+ const AttachmentPack &attachments)
{
RHI_UNIMPLEMENTED;
return 0;
-//* const GLuint fboId = m_glHelper->createFrameBufferObject();
-//* if (fboId) {
-//* // The FBO is created and its attachments are set once
-//* // Insert FBO into hash
-//* m_renderTargets.insert(renderTargetNodeId, fboId);
-//* // Bind FBO
-//* m_glHelper->bindFrameBufferObject(fboId, GraphicsHelperInterface::FBODraw);
-//* bindFrameBufferAttachmentHelper(fboId, attachments);
-//* } else {
-//* qCritical("Failed to create FBO");
-//* }
-//* return fboId;
+ //* const GLuint fboId = m_glHelper->createFrameBufferObject();
+ //* if (fboId) {
+ //* // The FBO is created and its attachments are set once
+ //* // Insert FBO into hash
+ //* m_renderTargets.insert(renderTargetNodeId, fboId);
+ //* // Bind FBO
+ //* m_glHelper->bindFrameBufferObject(fboId, GraphicsHelperInterface::FBODraw);
+ //* bindFrameBufferAttachmentHelper(fboId, attachments);
+ //* } else {
+ //* qCritical("Failed to create FBO");
+ //* }
+ //* return fboId;
}
-GLuint SubmissionContext::updateRenderTarget(Qt3DCore::QNodeId renderTargetNodeId, const AttachmentPack &attachments, bool isActiveRenderTarget)
+GLuint SubmissionContext::updateRenderTarget(Qt3DCore::QNodeId renderTargetNodeId,
+ const AttachmentPack &attachments,
+ bool isActiveRenderTarget)
{
RHI_UNIMPLEMENTED;
return 0;
-//* const GLuint fboId = m_renderTargets.value(renderTargetNodeId);
-//*
-//* // We need to check if one of the attachment was resized
-//* bool needsResize = !m_renderTargetsSize.contains(fboId); // not even initialized yet?
-//* if (!needsResize) {
-//* // render target exists, has attachment been resized?
-//* RHITextureManager *rhiTextureManager = m_renderer->rhiResourceManagers()->rhiTextureManager();
-//* const QSize s = m_renderTargetsSize[fboId];
-//* const auto attachments_ = attachments.attachments();
-//* for (const Attachment &attachment : attachments_) {
-//* RHITexture *rTex = rhiTextureManager->lookupResource(attachment.m_textureUuid);
-//* // ### TODO QTBUG-64757 this check is insufficient since the
-//* // texture may have changed to another one with the same size. That
-//* // case is not handled atm.
-//* if (rTex) {
-//* needsResize |= rTex->size() != s;
-//* if (isActiveRenderTarget && attachment.m_point == QRenderTargetOutput::Color0)
-//* m_renderTargetFormat = rTex->properties().format;
-//* }
-//* }
-//* }
-//*
-//* if (needsResize) {
-//* m_glHelper->bindFrameBufferObject(fboId, GraphicsHelperInterface::FBODraw);
-//* bindFrameBufferAttachmentHelper(fboId, attachments);
-//* }
-//*
-//* return fboId;
+ //* const GLuint fboId = m_renderTargets.value(renderTargetNodeId);
+ //*
+ //* // We need to check if one of the attachment was resized
+ //* bool needsResize = !m_renderTargetsSize.contains(fboId); // not even initialized yet?
+ //* if (!needsResize) {
+ //* // render target exists, has attachment been resized?
+ //* RHITextureManager *rhiTextureManager =
+ //m_renderer->rhiResourceManagers()->rhiTextureManager();
+ //* const QSize s = m_renderTargetsSize[fboId];
+ //* const auto attachments_ = attachments.attachments();
+ //* for (const Attachment &attachment : attachments_) {
+ //* RHITexture *rTex = rhiTextureManager->lookupResource(attachment.m_textureUuid);
+ //* // ### TODO QTBUG-64757 this check is insufficient since the
+ //* // texture may have changed to another one with the same size. That
+ //* // case is not handled atm.
+ //* if (rTex) {
+ //* needsResize |= rTex->size() != s;
+ //* if (isActiveRenderTarget && attachment.m_point ==
+ //QRenderTargetOutput::Color0)
+ //* m_renderTargetFormat = rTex->properties().format;
+ //* }
+ //* }
+ //* }
+ //*
+ //* if (needsResize) {
+ //* m_glHelper->bindFrameBufferObject(fboId, GraphicsHelperInterface::FBODraw);
+ //* bindFrameBufferAttachmentHelper(fboId, attachments);
+ //* }
+ //*
+ //* return fboId;
}
QSize SubmissionContext::renderTargetSize(const QSize &surfaceSize) const
{
RHI_UNIMPLEMENTED;
return surfaceSize;
-//* QSize renderTargetSize{};
-//* if (m_activeFBO != m_defaultFBO) {
-//* // For external FBOs we may not have a m_renderTargets entry.
-//* if (m_renderTargetsSize.contains(m_activeFBO)) {
-//* renderTargetSize = m_renderTargetsSize[m_activeFBO];
-//* } else if (surfaceSize.isValid()) {
-//* renderTargetSize = surfaceSize;
-//* } else {
-//* // External FBO (when used with QtQuick2 Scene3D)
-//*
-//* // Query FBO color attachment 0 size
-//* GLint attachmentObjectType = GL_NONE;
-//* GLint attachment0Name = 0;
-//* m_gl->functions()->glGetFramebufferAttachmentParameteriv(GL_FRAMEBUFFER,
-//* GL_COLOR_ATTACHMENT0,
-//* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE,
-//* &attachmentObjectType);
-//* m_gl->functions()->glGetFramebufferAttachmentParameteriv(GL_FRAMEBUFFER,
-//* GL_COLOR_ATTACHMENT0,
-//* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME,
-//* &attachment0Name);
-//*
-//* if (attachmentObjectType == GL_RENDERBUFFER && m_glHelper->supportsFeature(GraphicsHelperInterface::RenderBufferDimensionRetrieval))
-//* renderTargetSize = m_glHelper->getRenderBufferDimensions(attachment0Name);
-//* else if (attachmentObjectType == GL_TEXTURE && m_glHelper->supportsFeature(GraphicsHelperInterface::TextureDimensionRetrieval))
-//* // Assumes texture level 0 and GL_TEXTURE_2D target
-//* renderTargetSize = m_glHelper->getTextureDimensions(attachment0Name, GL_TEXTURE_2D);
-//* else
-//* return renderTargetSize;
-//* }
-//* } else {
-//* renderTargetSize = m_surface->size();
-//* if (m_surface->surfaceClass() == QSurface::Window) {
-//* const float dpr = static_cast<QWindow *>(m_surface)->devicePixelRatio();
-//* renderTargetSize *= dpr;
-//* }
-//* }
-//* return renderTargetSize;
+ //* QSize renderTargetSize{};
+ //* if (m_activeFBO != m_defaultFBO) {
+ //* // For external FBOs we may not have a m_renderTargets entry.
+ //* if (m_renderTargetsSize.contains(m_activeFBO)) {
+ //* renderTargetSize = m_renderTargetsSize[m_activeFBO];
+ //* } else if (surfaceSize.isValid()) {
+ //* renderTargetSize = surfaceSize;
+ //* } else {
+ //* // External FBO (when used with QtQuick2 Scene3D)
+ //*
+ //* // Query FBO color attachment 0 size
+ //* GLint attachmentObjectType = GL_NONE;
+ //* GLint attachment0Name = 0;
+ //* m_gl->functions()->glGetFramebufferAttachmentParameteriv(GL_FRAMEBUFFER,
+ //* GL_COLOR_ATTACHMENT0,
+ //* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE,
+ //* &attachmentObjectType);
+ //* m_gl->functions()->glGetFramebufferAttachmentParameteriv(GL_FRAMEBUFFER,
+ //* GL_COLOR_ATTACHMENT0,
+ //* GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME,
+ //* &attachment0Name);
+ //*
+ //* if (attachmentObjectType == GL_RENDERBUFFER &&
+ //m_glHelper->supportsFeature(GraphicsHelperInterface::RenderBufferDimensionRetrieval))
+ //* renderTargetSize = m_glHelper->getRenderBufferDimensions(attachment0Name);
+ //* else if (attachmentObjectType == GL_TEXTURE &&
+ //m_glHelper->supportsFeature(GraphicsHelperInterface::TextureDimensionRetrieval))
+ //* // Assumes texture level 0 and GL_TEXTURE_2D target
+ //* renderTargetSize = m_glHelper->getTextureDimensions(attachment0Name,
+ //GL_TEXTURE_2D);
+ //* else
+ //* return renderTargetSize;
+ //* }
+ //* } else {
+ //* renderTargetSize = m_surface->size();
+ //* if (m_surface->surfaceClass() == QSurface::Window) {
+ //* const float dpr = static_cast<QWindow *>(m_surface)->devicePixelRatio();
+ //* renderTargetSize *= dpr;
+ //* }
+ //* }
+ //* return renderTargetSize;
}
QImage SubmissionContext::readFramebuffer(const QRect &rect)
{
RHI_UNIMPLEMENTED;
return {};
-//* QImage img;
-//* const unsigned int area = rect.width() * rect.height();
-//* unsigned int bytes;
-//* GLenum format, type;
-//* QImage::Format imageFormat;
-//* uint stride;
-//*
-//* /* format value should match GL internalFormat */
-//* GLenum internalFormat = m_renderTargetFormat;
-//*
-//* switch (m_renderTargetFormat) {
-//* case QAbstractTexture::RGBAFormat:
-//* case QAbstractTexture::RGBA8_SNorm:
-//* case QAbstractTexture::RGBA8_UNorm:
-//* case QAbstractTexture::RGBA8U:
-//* case QAbstractTexture::SRGB8_Alpha8:
-//*#ifdef QT_OPENGL_ES_2
-//* format = GL_RGBA;
-//* imageFormat = QImage::Format_RGBA8888_Premultiplied;
-//*#else
-//* format = GL_BGRA;
-//* imageFormat = QImage::Format_ARGB32_Premultiplied;
-//* internalFormat = GL_RGBA8;
-//*#endif
-//* type = GL_UNSIGNED_BYTE;
-//* bytes = area * 4;
-//* stride = rect.width() * 4;
-//* break;
-//* case QAbstractTexture::SRGB8:
-//* case QAbstractTexture::RGBFormat:
-//* case QAbstractTexture::RGB8U:
-//* case QAbstractTexture::RGB8_UNorm:
-//*#ifdef QT_OPENGL_ES_2
-//* format = GL_RGBA;
-//* imageFormat = QImage::Format_RGBX8888;
-//*#else
-//* format = GL_BGRA;
-//* imageFormat = QImage::Format_RGB32;
-//* internalFormat = GL_RGB8;
-//*#endif
-//* type = GL_UNSIGNED_BYTE;
-//* bytes = area * 4;
-//* stride = rect.width() * 4;
-//* break;
-//*#ifndef QT_OPENGL_ES_2
-//* case QAbstractTexture::RG11B10F:
-//* bytes = area * 4;
-//* format = GL_RGB;
-//* type = GL_UNSIGNED_INT_10F_11F_11F_REV;
-//* imageFormat = QImage::Format_RGB30;
-//* stride = rect.width() * 4;
-//* break;
-//* case QAbstractTexture::RGB10A2:
-//* bytes = area * 4;
-//* format = GL_RGBA;
-//* type = GL_UNSIGNED_INT_2_10_10_10_REV;
-//* imageFormat = QImage::Format_A2BGR30_Premultiplied;
-//* stride = rect.width() * 4;
-//* break;
-//* case QAbstractTexture::R5G6B5:
-//* bytes = area * 2;
-//* format = GL_RGB;
-//* type = GL_UNSIGNED_SHORT;
-//* internalFormat = GL_UNSIGNED_SHORT_5_6_5_REV;
-//* imageFormat = QImage::Format_RGB16;
-//* stride = rect.width() * 2;
-//* break;
-//* case QAbstractTexture::RGBA16F:
-//* case QAbstractTexture::RGBA16U:
-//* case QAbstractTexture::RGBA32F:
-//* case QAbstractTexture::RGBA32U:
-//* bytes = area * 16;
-//* format = GL_RGBA;
-//* type = GL_FLOAT;
-//* imageFormat = QImage::Format_ARGB32_Premultiplied;
-//* stride = rect.width() * 16;
-//* break;
-//*#endif
-//* default:
-//* auto warning = qWarning();
-//* warning << "Unable to convert";
-//* QtDebugUtils::formatQEnum(warning, m_renderTargetFormat);
-//* warning << "render target texture format to QImage.";
-//* return img;
-//* }
-//*
-//* GLint samples = 0;
-//* m_gl->functions()->glGetIntegerv(GL_SAMPLES, &samples);
-//* if (samples > 0 && !m_glHelper->supportsFeature(GraphicsHelperInterface::BlitFramebuffer)) {
-//* qCWarning(Backend) << Q_FUNC_INFO << "Unable to capture multisampled framebuffer; "
-//* "Required feature BlitFramebuffer is missing.";
-//* return img;
-//* }
-//*
-//* img = QImage(rect.width(), rect.height(), imageFormat);
-//*
-//* QScopedArrayPointer<uchar> data(new uchar [bytes]);
-//*
-//* if (samples > 0) {
-//* // resolve multisample-framebuffer to renderbuffer and read pixels from it
-//* GLuint fbo, rb;
-//* QOpenGLFunctions *gl = m_gl->functions();
-//* gl->glGenFramebuffers(1, &fbo);
-//* gl->glBindFramebuffer(GL_DRAW_FRAMEBUFFER, fbo);
-//* gl->glGenRenderbuffers(1, &rb);
-//* gl->glBindRenderbuffer(GL_RENDERBUFFER, rb);
-//* gl->glRenderbufferStorage(GL_RENDERBUFFER, internalFormat, rect.width(), rect.height());
-//* gl->glFramebufferRenderbuffer(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_RENDERBUFFER, rb);
-//*
-//* const GLenum status = gl->glCheckFramebufferStatus(GL_DRAW_FRAMEBUFFER);
-//* if (status != GL_FRAMEBUFFER_COMPLETE) {
-//* gl->glDeleteRenderbuffers(1, &rb);
-//* gl->glDeleteFramebuffers(1, &fbo);
-//* qCWarning(Backend) << Q_FUNC_INFO << "Copy-framebuffer not complete: " << status;
-//* return img;
-//* }
-//*
-//* m_glHelper->blitFramebuffer(rect.x(), rect.y(), rect.x() + rect.width(), rect.y() + rect.height(),
-//* 0, 0, rect.width(), rect.height(),
-//* GL_COLOR_BUFFER_BIT, GL_NEAREST);
-//* gl->glBindFramebuffer(GL_READ_FRAMEBUFFER, fbo);
-//* gl->glReadPixels(0,0,rect.width(), rect.height(), format, type, data.data());
-//*
-//* copyGLFramebufferDataToImage(img, data.data(), stride, rect.width(), rect.height(), m_renderTargetFormat);
-//*
-//* gl->glBindRenderbuffer(GL_RENDERBUFFER, rb);
-//* gl->glDeleteRenderbuffers(1, &rb);
-//* gl->glBindFramebuffer(GL_FRAMEBUFFER, m_activeFBO);
-//* gl->glDeleteFramebuffers(1, &fbo);
-//* } else {
-//* // read pixels directly from framebuffer
-//* m_gl->functions()->glReadPixels(rect.x(), rect.y(), rect.width(), rect.height(), format, type, data.data());
-//* copyGLFramebufferDataToImage(img, data.data(), stride, rect.width(), rect.height(), m_renderTargetFormat);
-//* }
-//*
-//* return img;
+ //* QImage img;
+ //* const unsigned int area = rect.width() * rect.height();
+ //* unsigned int bytes;
+ //* GLenum format, type;
+ //* QImage::Format imageFormat;
+ //* uint stride;
+ //*
+ //* /* format value should match GL internalFormat */
+ //* GLenum internalFormat = m_renderTargetFormat;
+ //*
+ //* switch (m_renderTargetFormat) {
+ //* case QAbstractTexture::RGBAFormat:
+ //* case QAbstractTexture::RGBA8_SNorm:
+ //* case QAbstractTexture::RGBA8_UNorm:
+ //* case QAbstractTexture::RGBA8U:
+ //* case QAbstractTexture::SRGB8_Alpha8:
+ //*#ifdef QT_OPENGL_ES_2
+ //* format = GL_RGBA;
+ //* imageFormat = QImage::Format_RGBA8888_Premultiplied;
+ //*#else
+ //* format = GL_BGRA;
+ //* imageFormat = QImage::Format_ARGB32_Premultiplied;
+ //* internalFormat = GL_RGBA8;
+ //*#endif
+ //* type = GL_UNSIGNED_BYTE;
+ //* bytes = area * 4;
+ //* stride = rect.width() * 4;
+ //* break;
+ //* case QAbstractTexture::SRGB8:
+ //* case QAbstractTexture::RGBFormat:
+ //* case QAbstractTexture::RGB8U:
+ //* case QAbstractTexture::RGB8_UNorm:
+ //*#ifdef QT_OPENGL_ES_2
+ //* format = GL_RGBA;
+ //* imageFormat = QImage::Format_RGBX8888;
+ //*#else
+ //* format = GL_BGRA;
+ //* imageFormat = QImage::Format_RGB32;
+ //* internalFormat = GL_RGB8;
+ //*#endif
+ //* type = GL_UNSIGNED_BYTE;
+ //* bytes = area * 4;
+ //* stride = rect.width() * 4;
+ //* break;
+ //*#ifndef QT_OPENGL_ES_2
+ //* case QAbstractTexture::RG11B10F:
+ //* bytes = area * 4;
+ //* format = GL_RGB;
+ //* type = GL_UNSIGNED_INT_10F_11F_11F_REV;
+ //* imageFormat = QImage::Format_RGB30;
+ //* stride = rect.width() * 4;
+ //* break;
+ //* case QAbstractTexture::RGB10A2:
+ //* bytes = area * 4;
+ //* format = GL_RGBA;
+ //* type = GL_UNSIGNED_INT_2_10_10_10_REV;
+ //* imageFormat = QImage::Format_A2BGR30_Premultiplied;
+ //* stride = rect.width() * 4;
+ //* break;
+ //* case QAbstractTexture::R5G6B5:
+ //* bytes = area * 2;
+ //* format = GL_RGB;
+ //* type = GL_UNSIGNED_SHORT;
+ //* internalFormat = GL_UNSIGNED_SHORT_5_6_5_REV;
+ //* imageFormat = QImage::Format_RGB16;
+ //* stride = rect.width() * 2;
+ //* break;
+ //* case QAbstractTexture::RGBA16F:
+ //* case QAbstractTexture::RGBA16U:
+ //* case QAbstractTexture::RGBA32F:
+ //* case QAbstractTexture::RGBA32U:
+ //* bytes = area * 16;
+ //* format = GL_RGBA;
+ //* type = GL_FLOAT;
+ //* imageFormat = QImage::Format_ARGB32_Premultiplied;
+ //* stride = rect.width() * 16;
+ //* break;
+ //*#endif
+ //* default:
+ //* auto warning = qWarning();
+ //* warning << "Unable to convert";
+ //* QtDebugUtils::formatQEnum(warning, m_renderTargetFormat);
+ //* warning << "render target texture format to QImage.";
+ //* return img;
+ //* }
+ //*
+ //* GLint samples = 0;
+ //* m_gl->functions()->glGetIntegerv(GL_SAMPLES, &samples);
+ //* if (samples > 0 &&
+ //!m_glHelper->supportsFeature(GraphicsHelperInterface::BlitFramebuffer)) {
+ //* qCWarning(Backend) << Q_FUNC_INFO << "Unable to capture multisampled framebuffer; "
+ //* "Required feature BlitFramebuffer is missing.";
+ //* return img;
+ //* }
+ //*
+ //* img = QImage(rect.width(), rect.height(), imageFormat);
+ //*
+ //* QScopedArrayPointer<uchar> data(new uchar [bytes]);
+ //*
+ //* if (samples > 0) {
+ //* // resolve multisample-framebuffer to renderbuffer and read pixels from it
+ //* GLuint fbo, rb;
+ //* QOpenGLFunctions *gl = m_gl->functions();
+ //* gl->glGenFramebuffers(1, &fbo);
+ //* gl->glBindFramebuffer(GL_DRAW_FRAMEBUFFER, fbo);
+ //* gl->glGenRenderbuffers(1, &rb);
+ //* gl->glBindRenderbuffer(GL_RENDERBUFFER, rb);
+ //* gl->glRenderbufferStorage(GL_RENDERBUFFER, internalFormat, rect.width(),
+ //rect.height());
+ //* gl->glFramebufferRenderbuffer(GL_DRAW_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
+ //GL_RENDERBUFFER, rb);
+ //*
+ //* const GLenum status = gl->glCheckFramebufferStatus(GL_DRAW_FRAMEBUFFER);
+ //* if (status != GL_FRAMEBUFFER_COMPLETE) {
+ //* gl->glDeleteRenderbuffers(1, &rb);
+ //* gl->glDeleteFramebuffers(1, &fbo);
+ //* qCWarning(Backend) << Q_FUNC_INFO << "Copy-framebuffer not complete: " << status;
+ //* return img;
+ //* }
+ //*
+ //* m_glHelper->blitFramebuffer(rect.x(), rect.y(), rect.x() + rect.width(), rect.y() +
+ //rect.height(),
+ //* 0, 0, rect.width(), rect.height(),
+ //* GL_COLOR_BUFFER_BIT, GL_NEAREST);
+ //* gl->glBindFramebuffer(GL_READ_FRAMEBUFFER, fbo);
+ //* gl->glReadPixels(0,0,rect.width(), rect.height(), format, type, data.data());
+ //*
+ //* copyGLFramebufferDataToImage(img, data.data(), stride, rect.width(), rect.height(),
+ //m_renderTargetFormat);
+ //*
+ //* gl->glBindRenderbuffer(GL_RENDERBUFFER, rb);
+ //* gl->glDeleteRenderbuffers(1, &rb);
+ //* gl->glBindFramebuffer(GL_FRAMEBUFFER, m_activeFBO);
+ //* gl->glDeleteFramebuffers(1, &fbo);
+ //* } else {
+ //* // read pixels directly from framebuffer
+ //* m_gl->functions()->glReadPixels(rect.x(), rect.y(), rect.width(), rect.height(),
+ //format, type, data.data());
+ //* copyGLFramebufferDataToImage(img, data.data(), stride, rect.width(), rect.height(),
+ //m_renderTargetFormat);
+ //* }
+ //*
+ //* return img;
}
void SubmissionContext::releaseResources()
@@ -985,12 +1010,11 @@ void SubmissionContext::releaseResources()
#endif
}
-
-//* // Stop and destroy the OpenGL logger
-//* if (m_debugLogger) {
-//* m_debugLogger->stopLogging();
-//* m_debugLogger.reset(nullptr);
-//* }
+ //* // Stop and destroy the OpenGL logger
+ //* if (m_debugLogger) {
+ //* m_debugLogger->stopLogging();
+ //* m_debugLogger.reset(nullptr);
+ //* }
}
// Called only from RenderThread
@@ -1013,7 +1037,8 @@ bool SubmissionContext::activateShader(RHIShader *shader)
return true;
}
-void SubmissionContext::bindFrameBufferAttachmentHelper(GLuint fboId, const AttachmentPack &attachments)
+void SubmissionContext::bindFrameBufferAttachmentHelper(GLuint fboId,
+ const AttachmentPack &attachments)
{
RHI_UNIMPLEMENTED;
// Set FBO attachments. These are normally textures, except that on Open GL
@@ -1023,7 +1048,8 @@ void SubmissionContext::bindFrameBufferAttachmentHelper(GLuint fboId, const Atta
// stencil before 3.1 with the appropriate extension).
//* QSize fboSize;
- //* RHITextureManager *rhiTextureManager = m_renderer->rhiResourceManagers()->rhiTextureManager();
+ //* RHITextureManager *rhiTextureManager =
+ //m_renderer->rhiResourceManagers()->rhiTextureManager();
//* const auto attachments_ = attachments.attachments();
//* for (const Attachment &attachment : attachments_) {
//* RHITexture *rTex = rhiTextureManager->lookupResource(attachment.m_textureUuid);
@@ -1035,7 +1061,8 @@ void SubmissionContext::bindFrameBufferAttachmentHelper(GLuint fboId, const Atta
//* if (fboSize.isEmpty())
//* fboSize = QSize(glTex->width(), glTex->height());
//* else
- //* fboSize = QSize(qMin(fboSize.width(), glTex->width()), qMin(fboSize.height(), glTex->height()));
+ //* fboSize = QSize(qMin(fboSize.width(), glTex->width()),
+ //qMin(fboSize.height(), glTex->height()));
//* m_glHelper->bindFrameBufferAttachment(glTex, attachment);
//* }
//* } else {
@@ -1044,7 +1071,8 @@ void SubmissionContext::bindFrameBufferAttachmentHelper(GLuint fboId, const Atta
//* if (fboSize.isEmpty())
//* fboSize = QSize(renderBuffer->width(), renderBuffer->height());
//* else
- //* fboSize = QSize(qMin(fboSize.width(), renderBuffer->width()), qMin(fboSize.height(), renderBuffer->height()));
+ //* fboSize = QSize(qMin(fboSize.width(), renderBuffer->width()),
+ //qMin(fboSize.height(), renderBuffer->height()));
//* m_glHelper->bindFrameBufferAttachment(renderBuffer, attachment);
//* }
//* }
@@ -1069,7 +1097,6 @@ void SubmissionContext::activateDrawBuffers(const AttachmentPack &attachments)
//* }
}
-
void SubmissionContext::setActiveMaterial(Material *rmat)
{
if (m_material == rmat)
@@ -1085,108 +1112,130 @@ void SubmissionContext::applyState(const StateVariant &stateVariant,
switch (stateVariant.type) {
case AlphaCoverageStateMask: {
- applyStateHelper(static_cast<const AlphaCoverage *>(stateVariant.constState()), graphicsPipeline);
+ applyStateHelper(static_cast<const AlphaCoverage *>(stateVariant.constState()),
+ graphicsPipeline);
break;
}
case AlphaTestMask: {
- applyStateHelper(static_cast<const AlphaFunc *>(stateVariant.constState()), graphicsPipeline);
+ applyStateHelper(static_cast<const AlphaFunc *>(stateVariant.constState()),
+ graphicsPipeline);
break;
}
case BlendStateMask: {
- applyStateHelper(static_cast<const BlendEquation *>(stateVariant.constState()), graphicsPipeline);
+ applyStateHelper(static_cast<const BlendEquation *>(stateVariant.constState()),
+ graphicsPipeline);
break;
}
case BlendEquationArgumentsMask: {
- applyStateHelper(static_cast<const BlendEquationArguments *>(stateVariant.constState()), graphicsPipeline);
+ applyStateHelper(static_cast<const BlendEquationArguments *>(stateVariant.constState()),
+ graphicsPipeline);
break;
}
case MSAAEnabledStateMask: {
- applyStateHelper(static_cast<const MSAAEnabled *>(stateVariant.constState()), graphicsPipeline, m_renderer->format());
+ applyStateHelper(static_cast<const MSAAEnabled *>(stateVariant.constState()),
+ graphicsPipeline, m_renderer->format());
break;
}
case CullFaceStateMask: {
- applyStateHelper(static_cast<const CullFace *>(stateVariant.constState()), graphicsPipeline);
+ applyStateHelper(static_cast<const CullFace *>(stateVariant.constState()),
+ graphicsPipeline);
break;
}
case DepthWriteStateMask: {
- applyStateHelper(static_cast<const NoDepthMask *>(stateVariant.constState()), graphicsPipeline);
+ applyStateHelper(static_cast<const NoDepthMask *>(stateVariant.constState()),
+ graphicsPipeline);
break;
}
case DepthTestStateMask: {
- applyStateHelper(static_cast<const DepthTest *>(stateVariant.constState()), graphicsPipeline);
+ applyStateHelper(static_cast<const DepthTest *>(stateVariant.constState()),
+ graphicsPipeline);
break;
}
case DepthRangeMask: {
- applyStateHelper(static_cast<const DepthRange *>(stateVariant.constState()), graphicsPipeline);
+ applyStateHelper(static_cast<const DepthRange *>(stateVariant.constState()),
+ graphicsPipeline);
break;
}
case RasterModeMask: {
- applyStateHelper(static_cast<const RasterMode *>(stateVariant.constState()), graphicsPipeline);
+ applyStateHelper(static_cast<const RasterMode *>(stateVariant.constState()),
+ graphicsPipeline);
break;
}
case FrontFaceStateMask: {
- applyStateHelper(static_cast<const FrontFace *>(stateVariant.constState()), graphicsPipeline);
+ applyStateHelper(static_cast<const FrontFace *>(stateVariant.constState()),
+ graphicsPipeline);
break;
}
case ScissorStateMask: {
- applyStateHelper(static_cast<const ScissorTest *>(stateVariant.constState()), graphicsPipeline);
+ applyStateHelper(static_cast<const ScissorTest *>(stateVariant.constState()),
+ graphicsPipeline);
break;
}
case StencilTestStateMask: {
- applyStateHelper(static_cast<const StencilTest *>(stateVariant.constState()), graphicsPipeline);
+ applyStateHelper(static_cast<const StencilTest *>(stateVariant.constState()),
+ graphicsPipeline);
break;
}
case PointSizeMask: {
- applyStateHelper(static_cast<const PointSize *>(stateVariant.constState()), graphicsPipeline);
+ applyStateHelper(static_cast<const PointSize *>(stateVariant.constState()),
+ graphicsPipeline);
break;
}
case PolygonOffsetStateMask: {
- applyStateHelper(static_cast<const PolygonOffset *>(stateVariant.constState()), graphicsPipeline);
+ applyStateHelper(static_cast<const PolygonOffset *>(stateVariant.constState()),
+ graphicsPipeline);
break;
}
case ColorStateMask: {
- applyStateHelper(static_cast<const ColorMask *>(stateVariant.constState()), graphicsPipeline);
+ applyStateHelper(static_cast<const ColorMask *>(stateVariant.constState()),
+ graphicsPipeline);
break;
}
case ClipPlaneMask: {
- applyStateHelper(static_cast<const ClipPlane *>(stateVariant.constState()), graphicsPipeline);
+ applyStateHelper(static_cast<const ClipPlane *>(stateVariant.constState()),
+ graphicsPipeline);
break;
}
case SeamlessCubemapMask: {
- applyStateHelper(static_cast<const SeamlessCubemap *>(stateVariant.constState()), graphicsPipeline);
+ applyStateHelper(static_cast<const SeamlessCubemap *>(stateVariant.constState()),
+ graphicsPipeline);
break;
}
case StencilOpMask: {
- applyStateHelper(static_cast<const StencilOp *>(stateVariant.constState()), graphicsPipeline);
+ applyStateHelper(static_cast<const StencilOp *>(stateVariant.constState()),
+ graphicsPipeline);
break;
}
case StencilWriteStateMask: {
- applyStateHelper(static_cast<const StencilMask *>(stateVariant.constState()), graphicsPipeline);
+ applyStateHelper(static_cast<const StencilMask *>(stateVariant.constState()),
+ graphicsPipeline);
break;
}
case DitheringStateMask: {
- applyStateHelper(static_cast<const Dithering *>(stateVariant.constState()), graphicsPipeline);
+ applyStateHelper(static_cast<const Dithering *>(stateVariant.constState()),
+ graphicsPipeline);
break;
}
case LineWidthMask: {
- applyStateHelper(static_cast<const LineWidth *>(stateVariant.constState()), graphicsPipeline);
+ applyStateHelper(static_cast<const LineWidth *>(stateVariant.constState()),
+ graphicsPipeline);
break;
}
default:
@@ -1209,20 +1258,19 @@ void SubmissionContext::applyStateSet(const RenderStateSet *ss,
StateVariant *SubmissionContext::getState(RenderStateSet *ss, StateMask type) const
{
- const QVector<StateVariant>& statesToSet = ss->states();
+ const QVector<StateVariant> &statesToSet = ss->states();
for (int i = 0, m = statesToSet.size(); i < m; ++i) {
- const StateVariant& ds = statesToSet.at(i);
+ const StateVariant &ds = statesToSet.at(i);
if (ds.type == type)
return ss->states().begin() + i;
}
return nullptr;
}
-
SubmissionContext::SwapChainInfo *SubmissionContext::swapChainForSurface(QSurface *surface) noexcept
{
SwapChainInfo &swapChainInfo = m_swapChains[surface];
- auto& swapChain = swapChainInfo.swapChain;
+ auto &swapChain = swapChainInfo.swapChain;
if (swapChain == nullptr) {
swapChain = m_rhi->newSwapChain();
@@ -1231,29 +1279,25 @@ SubmissionContext::SwapChainInfo *SubmissionContext::swapChainForSurface(QSurfac
Q_ASSERT(window != nullptr);
const int samples = format().samples();
-
swapChain->setWindow(window);
swapChain->setFlags(QRhiSwapChain::Flags {});
swapChain->setSampleCount(samples);
- QRhiRenderBuffer *renderBuffer = m_rhi->newRenderBuffer(QRhiRenderBuffer::DepthStencil,
- QSize(),
- samples,
- QRhiRenderBuffer::UsedWithSwapChainOnly);
+ QRhiRenderBuffer *renderBuffer =
+ m_rhi->newRenderBuffer(QRhiRenderBuffer::DepthStencil, QSize(), samples,
+ QRhiRenderBuffer::UsedWithSwapChainOnly);
swapChain->setDepthStencil(renderBuffer);
- QRhiRenderPassDescriptor *renderPassDescriptor = swapChain->newCompatibleRenderPassDescriptor();
+ QRhiRenderPassDescriptor *renderPassDescriptor =
+ swapChain->newCompatibleRenderPassDescriptor();
swapChain->setRenderPassDescriptor(renderPassDescriptor);
// Build swapChain the first time
- if (swapChain->buildOrResize())
- {
+ if (swapChain->buildOrResize()) {
swapChainInfo.swapChain = swapChain;
swapChainInfo.renderBuffer = renderBuffer;
swapChainInfo.renderPassDescriptor = renderPassDescriptor;
- }
- else
- {
+ } else {
swapChain->releaseAndDestroyLater();
m_swapChains.remove(surface);
return nullptr;
@@ -1284,9 +1328,8 @@ QRhiRenderPassDescriptor *SubmissionContext::currentRenderPassDescriptor() const
QSurfaceFormat SubmissionContext::format() const noexcept
{
- if (this->m_rhi && this->m_rhi->backend() == QRhi::OpenGLES2)
- {
- auto rhi_gl = static_cast<const QRhiGles2NativeHandles*>(this->m_rhi->nativeHandles());
+ if (this->m_rhi && this->m_rhi->backend() == QRhi::OpenGLES2) {
+ auto rhi_gl = static_cast<const QRhiGles2NativeHandles *>(this->m_rhi->nativeHandles());
return rhi_gl->context->format();
}
return QSurfaceFormat::defaultFormat();
@@ -1314,11 +1357,13 @@ bool SubmissionContext::setParameters(ShaderParameterPack &parameterPack)
//* const ShaderParameterPack::NamedResource &namedTex = parameterPack.textures().at(i);
//* // Given a Texture QNodeId, we retrieve the associated shared RHITexture
//* if (uniformValues.contains(namedTex.glslNameId)) {
- //* RHITexture *t = m_renderer->rhiResourceManagers()->rhiTextureManager()->lookupResource(namedTex.nodeId);
+ //* RHITexture *t =
+ //m_renderer->rhiResourceManagers()->rhiTextureManager()->lookupResource(namedTex.nodeId);
//* if (t != nullptr) {
//* UniformValue &texUniform = uniformValues.value(namedTex.glslNameId);
//* if (texUniform.valueType() == UniformValue::TextureValue) {
- //* const int texUnit = m_textureContext.activateTexture(TextureSubmissionContext::TextureScopeMaterial, m_gl, t);
+ //* const int texUnit =
+ //m_textureContext.activateTexture(TextureSubmissionContext::TextureScopeMaterial, m_gl, t);
//* texUniform.data<int>()[namedTex.uniformArrayIndex] = texUnit;
//* if (texUnit == -1) {
//* if (namedTex.glslNameId != irradianceId &&
@@ -1339,16 +1384,17 @@ bool SubmissionContext::setParameters(ShaderParameterPack &parameterPack)
// for SSBO and UBO
// Bind Shader Storage block to SSBO and update SSBO
- const QVector<BlockToSSBO>& blockToSSBOs = parameterPack.shaderStorageBuffers();
- for (const BlockToSSBO& b : blockToSSBOs) {
+ const QVector<BlockToSSBO> &blockToSSBOs = parameterPack.shaderStorageBuffers();
+ for (const BlockToSSBO &b : blockToSSBOs) {
RHI_UNIMPLEMENTED;
- Buffer *cpuBuffer = m_renderer->nodeManagers()->bufferManager()->lookupResource(b.m_bufferID);
+ Buffer *cpuBuffer =
+ m_renderer->nodeManagers()->bufferManager()->lookupResource(b.m_bufferID);
RHIBuffer *ssbo = rhiBufferForRenderBuffer(cpuBuffer);
// bindShaderStorageBlock
// This is currently not required as we are introspecting the bindingIndex
// value from the shaders and not replacing them, making such a call useless
// bindShaderStorageBlock(shader->programId(), b.m_blockIndex, b.m_bindingIndex);
-// bindShaderStorageBlock(shader->programId(), b.m_blockIndex, b.m_bindingIndex);
+ // bindShaderStorageBlock(shader->programId(), b.m_blockIndex, b.m_bindingIndex);
// Needed to avoid conflict where the buffer would already
// be bound as a VertexArray
bindRHIBuffer(ssbo, RHIBuffer::ShaderStorageBuffer);
@@ -1362,9 +1408,10 @@ bool SubmissionContext::setParameters(ShaderParameterPack &parameterPack)
int uboIndex = 0;
for (const BlockToUBO &b : blockToUBOs) {
RHI_UNIMPLEMENTED;
- Buffer *cpuBuffer = m_renderer->nodeManagers()->bufferManager()->lookupResource(b.m_bufferID);
+ Buffer *cpuBuffer =
+ m_renderer->nodeManagers()->bufferManager()->lookupResource(b.m_bufferID);
RHIBuffer *ubo = rhiBufferForRenderBuffer(cpuBuffer);
-// bindUniformBlock(shader->programId(), b.m_blockIndex, uboIndex);
+ // bindUniformBlock(shader->programId(), b.m_blockIndex, uboIndex);
// Needed to avoid conflict where the buffer would already
// be bound as a VertexArray
bindRHIBuffer(ubo, RHIBuffer::UniformBuffer);
@@ -1383,12 +1430,12 @@ bool SubmissionContext::setParameters(ShaderParameterPack &parameterPack)
const UniformValue &v = values.value(uniform.m_nameId);
// skip invalid textures/images
- if ((v.valueType() == UniformValue::TextureValue ||
- v.valueType() == UniformValue::ShaderImageValue) &&
- *v.constData<int>() == -1)
+ if ((v.valueType() == UniformValue::TextureValue
+ || v.valueType() == UniformValue::ShaderImageValue)
+ && *v.constData<int>() == -1)
continue;
-// applyUniform(uniform, v);
+ // applyUniform(uniform, v);
}
// if not all data is valid, the next frame will be rendered immediately
return true;
@@ -1396,16 +1443,20 @@ bool SubmissionContext::setParameters(ShaderParameterPack &parameterPack)
void SubmissionContext::updateBuffer(Buffer *buffer)
{
- const QHash<Qt3DCore::QNodeId, HRHIBuffer>::iterator it = m_renderBufferHash.find(buffer->peerId());
+ const QHash<Qt3DCore::QNodeId, HRHIBuffer>::iterator it =
+ m_renderBufferHash.find(buffer->peerId());
if (it != m_renderBufferHash.end())
- uploadDataToRHIBuffer(buffer, m_renderer->rhiResourceManagers()->rhiBufferManager()->data(it.value()));
+ uploadDataToRHIBuffer(
+ buffer, m_renderer->rhiResourceManagers()->rhiBufferManager()->data(it.value()));
}
QByteArray SubmissionContext::downloadBufferContent(Buffer *buffer)
{
- const QHash<Qt3DCore::QNodeId, HRHIBuffer>::iterator it = m_renderBufferHash.find(buffer->peerId());
+ const QHash<Qt3DCore::QNodeId, HRHIBuffer>::iterator it =
+ m_renderBufferHash.find(buffer->peerId());
if (it != m_renderBufferHash.end())
- return downloadDataFromRHIBuffer(buffer, m_renderer->rhiResourceManagers()->rhiBufferManager()->data(it.value()));
+ return downloadDataFromRHIBuffer(
+ buffer, m_renderer->rhiResourceManagers()->rhiBufferManager()->data(it.value()));
return QByteArray();
}
@@ -1414,7 +1465,8 @@ void SubmissionContext::releaseBuffer(Qt3DCore::QNodeId bufferId)
auto it = m_renderBufferHash.find(bufferId);
if (it != m_renderBufferHash.end()) {
HRHIBuffer glBuffHandle = it.value();
- RHIBuffer *glBuff = m_renderer->rhiResourceManagers()->rhiBufferManager()->data(glBuffHandle);
+ RHIBuffer *glBuff =
+ m_renderer->rhiResourceManagers()->rhiBufferManager()->data(glBuffHandle);
Q_ASSERT(glBuff);
// Destroy the GPU resource
@@ -1428,7 +1480,8 @@ void SubmissionContext::releaseBuffer(Qt3DCore::QNodeId bufferId)
bool SubmissionContext::hasRHIBufferForBuffer(Buffer *buffer)
{
- const QHash<Qt3DCore::QNodeId, HRHIBuffer>::iterator it = m_renderBufferHash.find(buffer->peerId());
+ const QHash<Qt3DCore::QNodeId, HRHIBuffer>::iterator it =
+ m_renderBufferHash.find(buffer->peerId());
return (it != m_renderBufferHash.end());
}
@@ -1436,7 +1489,8 @@ RHIBuffer *SubmissionContext::rhiBufferForRenderBuffer(Buffer *buf)
{
if (!m_renderBufferHash.contains(buf->peerId()))
m_renderBufferHash.insert(buf->peerId(), createRHIBufferFor(buf));
- return m_renderer->rhiResourceManagers()->rhiBufferManager()->data(m_renderBufferHash.value(buf->peerId()));
+ return m_renderer->rhiResourceManagers()->rhiBufferManager()->data(
+ m_renderBufferHash.value(buf->peerId()));
}
HRHIBuffer SubmissionContext::createRHIBufferFor(Buffer *buffer)
@@ -1465,11 +1519,10 @@ void SubmissionContext::uploadDataToRHIBuffer(Buffer *buffer, RHIBuffer *b, bool
auto update = it;
// We have a partial update
if (update->offset >= 0) {
- //accumulate sequential updates as single one
+ // accumulate sequential updates as single one
int bufferSize = update->data.size();
auto it2 = it + 1;
- while ((it2 != updates.end())
- && (it2->offset - update->offset == bufferSize)) {
+ while ((it2 != updates.end()) && (it2->offset - update->offset == bufferSize)) {
bufferSize += it2->data.size();
++it2;
}
@@ -1499,112 +1552,116 @@ void SubmissionContext::uploadDataToRHIBuffer(Buffer *buffer, RHIBuffer *b, bool
QByteArray SubmissionContext::downloadDataFromRHIBuffer(Buffer *buffer, RHIBuffer *b)
{
- if (!bindRHIBuffer(b, RHIBuffer::ArrayBuffer)) // We're downloading, the type doesn't matter here
+ if (!bindRHIBuffer(b,
+ RHIBuffer::ArrayBuffer)) // We're downloading, the type doesn't matter here
qCWarning(Io) << Q_FUNC_INFO << "buffer bind failed";
return b->download(this, buffer->data().size());
}
void SubmissionContext::blitFramebuffer(Qt3DCore::QNodeId inputRenderTargetId,
- Qt3DCore::QNodeId outputRenderTargetId,
- QRect inputRect, QRect outputRect,
- uint defaultFboId,
+ Qt3DCore::QNodeId outputRenderTargetId, QRect inputRect,
+ QRect outputRect, uint defaultFboId,
QRenderTargetOutput::AttachmentPoint inputAttachmentPoint,
QRenderTargetOutput::AttachmentPoint outputAttachmentPoint,
QBlitFramebuffer::InterpolationMethod interpolationMethod)
{
RHI_UNIMPLEMENTED;
-//* GLuint inputFboId = defaultFboId;
-//* bool inputBufferIsDefault = true;
-//* if (!inputRenderTargetId.isNull()) {
-//* RenderTarget *renderTarget = m_renderer->nodeManagers()->renderTargetManager()->lookupResource(inputRenderTargetId);
-//* if (renderTarget) {
-//* AttachmentPack attachments(renderTarget, m_renderer->nodeManagers()->attachmentManager());
-//* if (m_renderTargets.contains(inputRenderTargetId))
-//* inputFboId = updateRenderTarget(inputRenderTargetId, attachments, false);
-//* else
-//* inputFboId = createRenderTarget(inputRenderTargetId, attachments);
-//* }
-//* inputBufferIsDefault = false;
-//* }
-//*
-//* GLuint outputFboId = defaultFboId;
-//* bool outputBufferIsDefault = true;
-//* if (!outputRenderTargetId.isNull()) {
-//* RenderTarget *renderTarget = m_renderer->nodeManagers()->renderTargetManager()->lookupResource(outputRenderTargetId);
-//* if (renderTarget) {
-//* AttachmentPack attachments(renderTarget, m_renderer->nodeManagers()->attachmentManager());
-//* if (m_renderTargets.contains(outputRenderTargetId))
-//* outputFboId = updateRenderTarget(outputRenderTargetId, attachments, false);
-//* else
-//* outputFboId = createRenderTarget(outputRenderTargetId, attachments);
-//* }
-//* outputBufferIsDefault = false;
-//* }
-//*
-//* // Up until this point the input and output rects are normal Qt rectangles.
-//* // Convert them to GL rectangles (Y at bottom).
-//* const int inputFboHeight = inputFboId == defaultFboId ? m_surfaceSize.height() : m_renderTargetsSize[inputFboId].height();
-//* const GLint srcX0 = inputRect.left();
-//* const GLint srcY0 = inputFboHeight - (inputRect.top() + inputRect.height());
-//* const GLint srcX1 = srcX0 + inputRect.width();
-//* const GLint srcY1 = srcY0 + inputRect.height();
-//*
-//* const int outputFboHeight = outputFboId == defaultFboId ? m_surfaceSize.height() : m_renderTargetsSize[outputFboId].height();
-//* const GLint dstX0 = outputRect.left();
-//* const GLint dstY0 = outputFboHeight - (outputRect.top() + outputRect.height());
-//* const GLint dstX1 = dstX0 + outputRect.width();
-//* const GLint dstY1 = dstY0 + outputRect.height();
-//*
-//* //Get the last bounded framebuffers
-//* const GLuint lastDrawFboId = boundFrameBufferObject();
-//*
-//* // Activate input framebuffer for reading
-//* bindFramebuffer(inputFboId, GraphicsHelperInterface::FBORead);
-//*
-//* // Activate output framebuffer for writing
-//* bindFramebuffer(outputFboId, GraphicsHelperInterface::FBODraw);
-//*
-//* //Bind texture
-//* if (!inputBufferIsDefault)
-//* readBuffer(GL_COLOR_ATTACHMENT0 + inputAttachmentPoint);
-//*
-//* if (!outputBufferIsDefault) {
-//* // Note that we use glDrawBuffers, not glDrawBuffer. The
-//* // latter is not available with GLES.
-//* const int buf = outputAttachmentPoint;
-//* drawBuffers(1, &buf);
-//* }
-//*
-//* // Blit framebuffer
-//* const GLenum mode = interpolationMethod ? GL_NEAREST : GL_LINEAR;
-//* m_glHelper->blitFramebuffer(srcX0, srcY0, srcX1, srcY1,
-//* dstX0, dstY0, dstX1, dstY1,
-//* GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT|GL_STENCIL_BUFFER_BIT,
-//* mode);
-//*
-//* // Reset draw buffer
-//* bindFramebuffer(lastDrawFboId, GraphicsHelperInterface::FBOReadAndDraw);
-//* if (outputAttachmentPoint != QRenderTargetOutput::Color0) {
-//* const int buf = QRenderTargetOutput::Color0;
-//* drawBuffers(1, &buf);
-//* }
+ //* GLuint inputFboId = defaultFboId;
+ //* bool inputBufferIsDefault = true;
+ //* if (!inputRenderTargetId.isNull()) {
+ //* RenderTarget *renderTarget =
+ //m_renderer->nodeManagers()->renderTargetManager()->lookupResource(inputRenderTargetId);
+ //* if (renderTarget) {
+ //* AttachmentPack attachments(renderTarget,
+ //m_renderer->nodeManagers()->attachmentManager());
+ //* if (m_renderTargets.contains(inputRenderTargetId))
+ //* inputFboId = updateRenderTarget(inputRenderTargetId, attachments, false);
+ //* else
+ //* inputFboId = createRenderTarget(inputRenderTargetId, attachments);
+ //* }
+ //* inputBufferIsDefault = false;
+ //* }
+ //*
+ //* GLuint outputFboId = defaultFboId;
+ //* bool outputBufferIsDefault = true;
+ //* if (!outputRenderTargetId.isNull()) {
+ //* RenderTarget *renderTarget =
+ //m_renderer->nodeManagers()->renderTargetManager()->lookupResource(outputRenderTargetId);
+ //* if (renderTarget) {
+ //* AttachmentPack attachments(renderTarget,
+ //m_renderer->nodeManagers()->attachmentManager());
+ //* if (m_renderTargets.contains(outputRenderTargetId))
+ //* outputFboId = updateRenderTarget(outputRenderTargetId, attachments, false);
+ //* else
+ //* outputFboId = createRenderTarget(outputRenderTargetId, attachments);
+ //* }
+ //* outputBufferIsDefault = false;
+ //* }
+ //*
+ //* // Up until this point the input and output rects are normal Qt rectangles.
+ //* // Convert them to GL rectangles (Y at bottom).
+ //* const int inputFboHeight = inputFboId == defaultFboId ? m_surfaceSize.height() :
+ //m_renderTargetsSize[inputFboId].height();
+ //* const GLint srcX0 = inputRect.left();
+ //* const GLint srcY0 = inputFboHeight - (inputRect.top() + inputRect.height());
+ //* const GLint srcX1 = srcX0 + inputRect.width();
+ //* const GLint srcY1 = srcY0 + inputRect.height();
+ //*
+ //* const int outputFboHeight = outputFboId == defaultFboId ? m_surfaceSize.height() :
+ //m_renderTargetsSize[outputFboId].height();
+ //* const GLint dstX0 = outputRect.left();
+ //* const GLint dstY0 = outputFboHeight - (outputRect.top() + outputRect.height());
+ //* const GLint dstX1 = dstX0 + outputRect.width();
+ //* const GLint dstY1 = dstY0 + outputRect.height();
+ //*
+ //* //Get the last bounded framebuffers
+ //* const GLuint lastDrawFboId = boundFrameBufferObject();
+ //*
+ //* // Activate input framebuffer for reading
+ //* bindFramebuffer(inputFboId, GraphicsHelperInterface::FBORead);
+ //*
+ //* // Activate output framebuffer for writing
+ //* bindFramebuffer(outputFboId, GraphicsHelperInterface::FBODraw);
+ //*
+ //* //Bind texture
+ //* if (!inputBufferIsDefault)
+ //* readBuffer(GL_COLOR_ATTACHMENT0 + inputAttachmentPoint);
+ //*
+ //* if (!outputBufferIsDefault) {
+ //* // Note that we use glDrawBuffers, not glDrawBuffer. The
+ //* // latter is not available with GLES.
+ //* const int buf = outputAttachmentPoint;
+ //* drawBuffers(1, &buf);
+ //* }
+ //*
+ //* // Blit framebuffer
+ //* const GLenum mode = interpolationMethod ? GL_NEAREST : GL_LINEAR;
+ //* m_glHelper->blitFramebuffer(srcX0, srcY0, srcX1, srcY1,
+ //* dstX0, dstY0, dstX1, dstY1,
+ //* GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT|GL_STENCIL_BUFFER_BIT,
+ //* mode);
+ //*
+ //* // Reset draw buffer
+ //* bindFramebuffer(lastDrawFboId, GraphicsHelperInterface::FBOReadAndDraw);
+ //* if (outputAttachmentPoint != QRenderTargetOutput::Color0) {
+ //* const int buf = QRenderTargetOutput::Color0;
+ //* drawBuffers(1, &buf);
+ //* }
}
-namespace
-{
+namespace {
template<std::size_t N>
-constexpr int getFirstAvailableBit(const std::bitset<N>& bits)
+constexpr int getFirstAvailableBit(const std::bitset<N> &bits)
{
- for (std::size_t i = 0; i < N; i++)
- {
+ for (std::size_t i = 0; i < N; i++) {
if (!bits.test(i))
return i;
}
return -1;
}
// This function ensures that the shader stages all have the same bindings
-void preprocessRHIShader(QVector<QByteArray>& shaderCodes)
+void preprocessRHIShader(QVector<QByteArray> &shaderCodes)
{
// Map the variable names to bindings
std::map<QByteArray, int> bindings;
@@ -1615,21 +1672,22 @@ void preprocessRHIShader(QVector<QByteArray>& shaderCodes)
assignedBindings.set(1);
thread_local const QRegularExpression samplerRegex(
- QStringLiteral("binding\\s*=\\s*([0-9]+).*\\)\\s*uniform\\s*[ui]?sampler[a-zA-Z0-9]+\\s*([a-zA-Z0-9_]+)\\s*;"));
+ QStringLiteral("binding\\s*=\\s*([0-9]+).*\\)\\s*uniform\\s*[ui]?sampler[a-zA-Z0-9]+"
+ "\\s*([a-zA-Z0-9_]+)\\s*;"));
thread_local const QRegularExpression uboRegex(
- QStringLiteral("(?:std140\\s*,\\s*binding\\s*=\\s*([0-9]+).*|binding\\s*=\\s*([0-9]+)\\s*,\\s*std140.*)\\)\\s*uniform\\s*([a-zA-Z0-9_]+)"));
+ QStringLiteral("(?:std140\\s*,\\s*binding\\s*=\\s*([0-9]+).*|binding\\s*=\\s*([0-9]+)"
+ "\\s*,\\s*std140.*)\\)\\s*uniform\\s*([a-zA-Z0-9_]+)"));
- auto replaceBinding = [&bindings, &assignedBindings] (int& offset, QRegularExpressionMatch& match, QByteArray& code, int indexCapture, int variableCapture) noexcept
- {
+ auto replaceBinding = [&bindings, &assignedBindings](
+ int &offset, QRegularExpressionMatch &match, QByteArray &code,
+ int indexCapture, int variableCapture) noexcept {
int index = match.captured(indexCapture).toInt();
QByteArray variable = match.captured(variableCapture).toUtf8();
auto it = bindings.find(variable);
- if (it == bindings.end())
- {
+ if (it == bindings.end()) {
// 1. Check if the index is already used
- if (assignedBindings.test(index))
- {
+ if (assignedBindings.test(index)) {
index = getFirstAvailableBit(assignedBindings);
if (index == -1) {
return;
@@ -1643,9 +1701,7 @@ void preprocessRHIShader(QVector<QByteArray>& shaderCodes)
assignedBindings.set(index);
bindings.emplace(std::move(variable), index);
- }
- else
- {
+ } else {
int indexToUse = it->second;
const int indexStartOffset = match.capturedStart(indexCapture);
const int indexEndOffset = match.capturedEnd(indexCapture);
@@ -1657,13 +1713,11 @@ void preprocessRHIShader(QVector<QByteArray>& shaderCodes)
offset = match.capturedEnd(0);
};
- for (QByteArray& shaderCode : shaderCodes)
- {
+ for (QByteArray &shaderCode : shaderCodes) {
// Regex for the sampler variables
int offset = 0;
auto match = samplerRegex.match(shaderCode, offset);
- while (match.hasMatch())
- {
+ while (match.hasMatch()) {
const int indexCapture = 1;
const int variableCapture = 2;
replaceBinding(offset, match, shaderCode, indexCapture, variableCapture);
@@ -1674,8 +1728,7 @@ void preprocessRHIShader(QVector<QByteArray>& shaderCodes)
// Regex for the UBOs
offset = 0;
match = uboRegex.match(shaderCode, offset);
- while (match.hasMatch())
- {
+ while (match.hasMatch()) {
const int indexCapture = !match.capturedView(1).isEmpty() ? 1 : 2;
const int variableCapture = 3;
replaceBinding(offset, match, shaderCode, indexCapture, variableCapture);
@@ -1685,39 +1738,25 @@ void preprocessRHIShader(QVector<QByteArray>& shaderCodes)
}
}
-int glslVersionForFormat(const QSurfaceFormat& format) noexcept
+int glslVersionForFormat(const QSurfaceFormat &format) noexcept
{
const int major = format.majorVersion();
const int minor = format.minorVersion();
static const QHash<std::pair<int, int>, int> glVersionToGLSLVersion = {
- { {4, 6}, 460 },
- { {4, 5}, 450 },
- { {4, 4}, 440 },
- { {4, 3}, 430 },
- { {4, 2}, 420 },
- { {4, 1}, 410 },
- { {4, 0}, 400 },
- { {3, 3}, 330 },
- { {3, 2}, 150 },
- { {3, 2}, 120 },
- { {3, 1}, 120 },
+ { { 4, 6 }, 460 }, { { 4, 5 }, 450 }, { { 4, 4 }, 440 }, { { 4, 3 }, 430 },
+ { { 4, 2 }, 420 }, { { 4, 1 }, 410 }, { { 4, 0 }, 400 }, { { 3, 3 }, 330 },
+ { { 3, 2 }, 150 }, { { 3, 2 }, 120 }, { { 3, 1 }, 120 },
};
- const auto it = glVersionToGLSLVersion.find({major, minor});
- if (it == glVersionToGLSLVersion.end())
- {
- if (major < 3)
- {
+ const auto it = glVersionToGLSLVersion.find({ major, minor });
+ if (it == glVersionToGLSLVersion.end()) {
+ if (major < 3) {
return 120;
- }
- else
- {
+ } else {
return major * 100 + minor * 10;
}
- }
- else
- {
+ } else {
return *it;
}
}
@@ -1727,25 +1766,22 @@ int glslVersionForFormat(const QSurfaceFormat& format) noexcept
SubmissionContext::ShaderCreationInfo SubmissionContext::createShaderProgram(RHIShader *shader)
{
// Compile shaders
- const auto& shaderCode = shader->shaderCode();
+ const auto &shaderCode = shader->shaderCode();
QShaderBaker b;
b.setGeneratedShaders({
- {QShader::SpirvShader, 100},
+ { QShader::SpirvShader, 100 },
#ifndef QT_NO_OPENGL
- {QShader::GlslShader, glslVersionForFormat(format())},
+ { QShader::GlslShader, glslVersionForFormat(format()) },
#endif
- {QShader::HlslShader, QShaderVersion(50)},
- {QShader::MslShader, QShaderVersion(12)},
- });
-
-
- b.setGeneratedShaderVariants({QShader::Variant{},
- #ifndef QT_NO_OPENGL
- QShader::Variant{},
- #endif
- QShader::Variant{},
- QShader::Variant{}});
+ { QShader::HlslShader, QShaderVersion(50) },
+ { QShader::MslShader, QShaderVersion(12) },
+ });
+ b.setGeneratedShaderVariants({ QShader::Variant {},
+#ifndef QT_NO_OPENGL
+ QShader::Variant {},
+#endif
+ QShader::Variant {}, QShader::Variant {} });
// TODO handle caching as QShader does not have a built-in mechanism for that
QString logs;
@@ -1760,7 +1796,8 @@ SubmissionContext::ShaderCreationInfo SubmissionContext::createShaderProgram(RHI
b.setSourceString(shaderCode.at(i), rhiStage);
QShader bakedShader = b.bake();
if (b.errorMessage() != QString() || !bakedShader.isValid()) {
- qDebug() << "Shader Error: " << b.errorMessage() << shaderCode.at(i).data() << rhiStage;
+ qDebug() << "Shader Error: " << b.errorMessage() << shaderCode.at(i).data()
+ << rhiStage;
logs += b.errorMessage();
success = false;
}
@@ -1772,12 +1809,11 @@ SubmissionContext::ShaderCreationInfo SubmissionContext::createShaderProgram(RHI
if (success)
shader->introspect();
- return {success, logs};
+ return { success, logs };
}
// Called by Renderer::updateResources
-void SubmissionContext::loadShader(Shader *shaderNode,
- ShaderManager *shaderManager,
+void SubmissionContext::loadShader(Shader *shaderNode, ShaderManager *shaderManager,
RHIShaderManager *rhiShaderManager)
{
const Qt3DCore::QNodeId shaderId = shaderNode->peerId();
@@ -1792,7 +1828,8 @@ void SubmissionContext::loadShader(Shader *shaderNode,
// We create or adopt an already created rhiShader
rhiShader = rhiShaderManager->createOrAdoptExisting(shaderNode);
- const QVector<Qt3DCore::QNodeId> sharedShaderIds = rhiShaderManager->shaderIdsForProgram(rhiShader);
+ const QVector<Qt3DCore::QNodeId> sharedShaderIds =
+ rhiShaderManager->shaderIdsForProgram(rhiShader);
if (sharedShaderIds.size() == 1) {
// Shader in the cache hasn't been loaded yet
QVector<QByteArray> shaderCodes = shaderNode->shaderCode();
@@ -1800,13 +1837,14 @@ void SubmissionContext::loadShader(Shader *shaderNode,
rhiShader->setShaderCode(shaderCodes);
const ShaderCreationInfo loadResult = createShaderProgram(rhiShader);
- shaderNode->setStatus(loadResult.linkSucceeded ? QShaderProgram::Ready : QShaderProgram::Error);
+ shaderNode->setStatus(loadResult.linkSucceeded ? QShaderProgram::Ready
+ : QShaderProgram::Error);
shaderNode->setLog(loadResult.logs);
// Loaded in the sense we tried to load it (and maybe it failed)
rhiShader->setLoaded(true);
} else {
// Find an already loaded shader that shares the same QShaderProgram
- for (const Qt3DCore::QNodeId& sharedShaderId : sharedShaderIds) {
+ for (const Qt3DCore::QNodeId &sharedShaderId : sharedShaderIds) {
if (sharedShaderId != shaderNode->peerId()) {
Shader *refShader = shaderManager->lookupResource(sharedShaderId);
// We only introspect once per actual OpenGL shader program
@@ -1821,7 +1859,6 @@ void SubmissionContext::loadShader(Shader *shaderNode,
shaderNode->requestCacheRebuild();
}
-
const GraphicsApiFilterData *SubmissionContext::contextInfo() const
{
return &m_contextInfo;
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 22:42:55 +0000