diff options
author | Aurélien Brooke <aurelien@bahiasoft.fr> | 2022-12-20 21:57:50 +0100 |
---|---|---|
committer | Aurélien Brooke <aurelien@bahiasoft.fr> | 2022-12-21 17:31:37 +0100 |
commit | f1c520e5a965e50afb2dea2dcb1fbdc2225d6576 (patch) | |
tree | 818ab562892cece832c25f572e4bc6e35950d1fb /src | |
parent | 0c692e4af36a9ad86c9da31ae8e83495ff086668 (diff) |
RHI SubmissionContext: remove unused members
Change-Id: I193e646fbc1b33e112bed58059ec536c46064bc9
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/renderers/rhi/graphicshelpers/submissioncontext.cpp | 11 | ||||
-rw-r--r-- | src/plugins/renderers/rhi/graphicshelpers/submissioncontext_p.h | 9 |
2 files changed, 4 insertions, 16 deletions
diff --git a/src/plugins/renderers/rhi/graphicshelpers/submissioncontext.cpp b/src/plugins/renderers/rhi/graphicshelpers/submissioncontext.cpp index 68310b00e..32fd7fcf2 100644 --- a/src/plugins/renderers/rhi/graphicshelpers/submissioncontext.cpp +++ b/src/plugins/renderers/rhi/graphicshelpers/submissioncontext.cpp @@ -465,15 +465,12 @@ static QShader::Stage rhiShaderStage(QShaderProgram::ShaderType type) noexcept } // anonymous SubmissionContext::SubmissionContext() - : m_ownsRhiCtx(false), + : m_initialized(false), + m_ownsRhiCtx(false), m_drivenExternally(false), m_id(nextFreeContextId()), - m_surface(nullptr), - m_renderTargetFormat(QAbstractTexture::NoFormat), m_material(nullptr), m_renderer(nullptr), - m_uboTempArray(QByteArray(1024, 0)), - m_initialized(false), m_rhi(nullptr), m_currentSwapChain(nullptr), m_currentRenderPassDescriptor(nullptr), @@ -611,8 +608,6 @@ bool SubmissionContext::beginDrawing(QSurface *surface) { Q_ASSERT(surface); - m_surface = surface; - Q_ASSERT(isInitialized()); // In the Scene3D case it does not make sense to create SwapChains as we @@ -627,7 +622,7 @@ bool SubmissionContext::beginDrawing(QSurface *surface) QRhiSwapChain *swapChain = swapChainInfo->swapChain; // Resize swapchain if needed - if (m_surface->size() != swapChain->currentPixelSize()) { + if (surface->size() != swapChain->currentPixelSize()) { bool couldRebuild = swapChain->createOrResize(); if (!couldRebuild) return false; diff --git a/src/plugins/renderers/rhi/graphicshelpers/submissioncontext_p.h b/src/plugins/renderers/rhi/graphicshelpers/submissioncontext_p.h index fbff5997a..350ed00b6 100644 --- a/src/plugins/renderers/rhi/graphicshelpers/submissioncontext_p.h +++ b/src/plugins/renderers/rhi/graphicshelpers/submissioncontext_p.h @@ -171,23 +171,16 @@ private: // States void applyState(const StateVariant &state, QRhiGraphicsPipeline *graphicsPipeline); + bool m_initialized; bool m_ownsRhiCtx; bool m_drivenExternally; const unsigned int m_id; - QSurface *m_surface; - QSize m_surfaceSize; QHash<Qt3DCore::QNodeId, HRHIBuffer> m_renderBufferHash; - QHash<Qt3DCore::QNodeId, GLuint> m_renderTargets; - QHash<GLuint, QSize> m_renderTargetsSize; - QAbstractTexture::TextureFormat m_renderTargetFormat; Material *m_material; Renderer *m_renderer; - QByteArray m_uboTempArray; - - bool m_initialized; GraphicsApiFilterData m_contextInfo; |