diff options
| author | Andy Nichols <andy.nichols@qt.io> | 2018-04-12 10:10:07 +0200 |
|---|---|---|
| committer | Andy Nichols <andy.nichols@qt.io> | 2018-04-12 15:03:27 +0000 |
| commit | 81cbbc022bb67a14b1cb5e855c8d4754a4538e70 (patch) | |
| tree | ef60cafb5ac3998b06e1b631809eebfe690af0cc | |
| parent | 3d58bebb3227764c24ef06b79e85bf4b43021eff (diff) | |
Fix compilation with QT3D_RENDER_ASPECT_OPENGL_DEBUG define
Change-Id: If89cc9d4be85ad36dfd7549e58327d8a525210e9
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
| -rw-r--r-- | src/render/renderers/opengl/graphicshelpers/submissioncontext.cpp | 2 | ||||
| -rw-r--r-- | src/render/renderers/opengl/renderer/renderer.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/render/renderers/opengl/graphicshelpers/submissioncontext.cpp b/src/render/renderers/opengl/graphicshelpers/submissioncontext.cpp index a8aabe16e..7072ed03e 100644 --- a/src/render/renderers/opengl/graphicshelpers/submissioncontext.cpp +++ b/src/render/renderers/opengl/graphicshelpers/submissioncontext.cpp @@ -896,7 +896,7 @@ int SubmissionContext::activateTexture(TextureScope scope, GLTexture *tex, int o int err = m_gl->functions()->glGetError(); if (err) qCWarning(Backend) << "GL error after activating texture" << QString::number(err, 16) - << tex->textureId() << "on unit" << onUnit; + << tex->getGLTexture()->textureId() << "on unit" << onUnit; #endif m_activeTextures[onUnit].score = 200; diff --git a/src/render/renderers/opengl/renderer/renderer.cpp b/src/render/renderers/opengl/renderer/renderer.cpp index 57b5b559c..bcc5fba80 100644 --- a/src/render/renderers/opengl/renderer/renderer.cpp +++ b/src/render/renderers/opengl/renderer/renderer.cpp @@ -1759,7 +1759,7 @@ void Renderer::performDraw(RenderCommand *command) } #if defined(QT3D_RENDER_ASPECT_OPENGL_DEBUG) - int err = m_graphicsContext->openGLContext()->functions()->glGetError(); + int err = m_submissionContext->openGLContext()->functions()->glGetError(); if (err) qCWarning(Rendering) << "GL error after drawing mesh:" << QString::number(err, 16); #endif @@ -1788,7 +1788,7 @@ void Renderer::performCompute(const RenderView *, RenderCommand *command) m_dirtyBits.marked |= AbstractRenderer::ComputeDirty; #if defined(QT3D_RENDER_ASPECT_OPENGL_DEBUG) - int err = m_graphicsContext->openGLContext()->functions()->glGetError(); + int err = m_submissionContext->openGLContext()->functions()->glGetError(); if (err) qCWarning(Rendering) << "GL error after drawing mesh:" << QString::number(err, 16); #endif |