diff options
Diffstat (limited to 'src/render/renderers/opengl')
4 files changed, 13 insertions, 7 deletions
diff --git a/src/render/renderers/opengl/graphicshelpers/submissioncontext.cpp b/src/render/renderers/opengl/graphicshelpers/submissioncontext.cpp index 4b4199820..4d42b6291 100644 --- a/src/render/renderers/opengl/graphicshelpers/submissioncontext.cpp +++ b/src/render/renderers/opengl/graphicshelpers/submissioncontext.cpp @@ -538,9 +538,9 @@ GLuint SubmissionContext::updateRenderTarget(Qt3DCore::QNodeId renderTargetNodeI // ### 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. - needsResize |= (rTex != nullptr && rTex->size() != s); - if (isActiveRenderTarget) { - if (attachment.m_point == QRenderTargetOutput::Color0) + if (rTex) { + needsResize |= rTex->size() != s; + if (isActiveRenderTarget && attachment.m_point == QRenderTargetOutput::Color0) m_renderTargetFormat = rTex->properties().format; } } diff --git a/src/render/renderers/opengl/jobs/renderviewbuilderjob.cpp b/src/render/renderers/opengl/jobs/renderviewbuilderjob.cpp index fa6218d6f..42f00d9f2 100644 --- a/src/render/renderers/opengl/jobs/renderviewbuilderjob.cpp +++ b/src/render/renderers/opengl/jobs/renderviewbuilderjob.cpp @@ -53,10 +53,12 @@ int renderViewInstanceCounter = 0; } // anonymous RenderViewBuilderJob::RenderViewBuilderJob() - : Qt3DCore::QAspectJob(), - m_renderView(nullptr) + : Qt3DCore::QAspectJob() + , m_renderView(nullptr) + , m_renderer(nullptr) + , m_index(0) { - SET_JOB_RUN_STAT_TYPE(this, JobTypes::RenderViewBuilder, renderViewInstanceCounter++); + SET_JOB_RUN_STAT_TYPE(this, JobTypes::RenderViewBuilder, renderViewInstanceCounter++) } void RenderViewBuilderJob::run() diff --git a/src/render/renderers/opengl/renderer/rendercommand.cpp b/src/render/renderers/opengl/renderer/rendercommand.cpp index e60b17668..ee0bf0aec 100644 --- a/src/render/renderers/opengl/renderer/rendercommand.cpp +++ b/src/render/renderers/opengl/renderer/rendercommand.cpp @@ -48,6 +48,7 @@ RenderCommand::RenderCommand() : m_stateSet(nullptr) , m_depth(0.0f) , m_changeCost(0) + , m_shaderDna(0) , m_type(RenderCommand::Draw) , m_primitiveCount(0) , m_primitiveType(QGeometryRenderer::Triangles) diff --git a/src/render/renderers/opengl/renderer/renderview.cpp b/src/render/renderers/opengl/renderer/renderview.cpp index aa9f4d1a5..48f622c07 100644 --- a/src/render/renderers/opengl/renderer/renderview.cpp +++ b/src/render/renderers/opengl/renderer/renderview.cpp @@ -238,11 +238,14 @@ RenderView::RenderView() : m_isDownloadBuffersEnable(false) , m_hasBlitFramebufferInfo(false) , m_renderer(nullptr) + , m_manager(nullptr) , m_devicePixelRatio(1.) - , m_viewport(QRectF(0.0f, 0.0f, 1.0f, 1.0f)) + , m_viewport(QRectF(0., 0., 1., 1.)) , m_gamma(2.2f) , m_surface(nullptr) , m_clearBuffer(QClearBuffers::None) + , m_clearDepthValue(1.f) + , m_clearStencilValue(0) , m_stateSet(nullptr) , m_noDraw(false) , m_compute(false) |