diff options
| author | Mike Krus <mike.krus@kdab.com> | 2019-08-23 10:52:42 +0100 |
|---|---|---|
| committer | Mike Krus <mike.krus@kdab.com> | 2019-09-04 11:25:04 +0100 |
| commit | 661cbf25b3ee924700ad09865dc902d3acbb5739 (patch) | |
| tree | 3340ec5d13d06084d88bbe569a44603c3fc01249 | |
| parent | 00e12527dbaacf700ff7a22177a96c5628709fae (diff) | |
Fix compile warnings
Change-Id: I7c367b2f754bbfcb3e32a617b0edcfc7e06608d7
Reviewed-by: Mike Krus <mike.krus@kdab.com>
| -rw-r--r-- | src/render/renderers/opengl/renderer/renderview.cpp | 1 | ||||
| -rw-r--r-- | src/render/renderers/opengl/textures/gltexture.cpp | 12 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/render/renderers/opengl/renderer/renderview.cpp b/src/render/renderers/opengl/renderer/renderview.cpp index 5845fe147..378cb02ab 100644 --- a/src/render/renderers/opengl/renderer/renderview.cpp +++ b/src/render/renderers/opengl/renderer/renderview.cpp @@ -425,7 +425,6 @@ struct SubRangeSorter<QSortPolicy::Texture> QVector<ShaderParameterPack::NamedResource> texturesB = b->m_parameterPack.textures(); const int originalTextureASize = texturesA.size(); - const bool isSuperior = originalTextureASize > texturesB.size(); if (texturesB.size() > texturesA.size()) qSwap(texturesA, texturesB); diff --git a/src/render/renderers/opengl/textures/gltexture.cpp b/src/render/renderers/opengl/textures/gltexture.cpp index 7a49304e3..95f63480c 100644 --- a/src/render/renderers/opengl/textures/gltexture.cpp +++ b/src/render/renderers/opengl/textures/gltexture.cpp @@ -474,15 +474,15 @@ QOpenGLTexture *GLTexture::buildGLTexture() QAbstractTexture::TextureFormat format = m_properties.format; if (ctx->isOpenGLES() && ctx->format().majorVersion() < 3) { switch (m_properties.format) { - case QOpenGLTexture::RGBA8_UNorm: - case QOpenGLTexture::RGBAFormat: + case QAbstractTexture::RGBA8_UNorm: + case QAbstractTexture::RGBAFormat: format = QAbstractTexture::RGBAFormat; break; - case QOpenGLTexture::RGB8_UNorm: - case QOpenGLTexture::RGBFormat: + case QAbstractTexture::RGB8_UNorm: + case QAbstractTexture::RGBFormat: format = QAbstractTexture::RGBFormat; break; - case QOpenGLTexture::DepthFormat: + case QAbstractTexture::DepthFormat: format = QAbstractTexture::DepthFormat; break; default: @@ -675,8 +675,8 @@ void GLTexture::introspectPropertiesFromSharedTextureId() const QPair<int, int> ctxGLVersion = ctx->format().version(); if (ctxGLVersion.first > 4 || (ctxGLVersion.first == 4 && ctxGLVersion.second >= 5)) { // Only for GL 4.5+ - QOpenGLFunctions_4_5_Core *gl5 = ctx->versionFunctions<QOpenGLFunctions_4_5_Core>(); #ifdef GL_TEXTURE_TARGET + QOpenGLFunctions_4_5_Core *gl5 = ctx->versionFunctions<QOpenGLFunctions_4_5_Core>(); if (gl5 != nullptr) gl5->glGetTextureParameteriv(m_sharedTextureId, GL_TEXTURE_TARGET, reinterpret_cast<int *>(&m_properties.target)); #endif |