diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2014-05-25 15:30:30 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-25 15:51:07 +0200 |
| commit | 1a4ff6f122f575aca21f6a0b9d9c14cac4a5ea66 (patch) | |
| tree | 5e80ea5487276450bb2a24eceec8b24565347f85 /src | |
| parent | 9b27240e4a30dd8b0d504f696f45c6c25caaa259 (diff) | |
QOpenGLTexture: test for extensions when checking features
Don't use only the GL version, as vendors expose many many extensions
on viable hardware.
For instance, I have a NVIDIA G210 which supports up to GL3.3, but
which features immutable storage, immutable multisampled storage,
texture buffers and ranges, stencil texturing, and cubemap arrays.
Change-Id: Ie6023ee854b679737fca982578cb2093e10d083f
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/opengl/qopengltexture.cpp | 32 |
1 files changed, 24 insertions, 8 deletions
diff --git a/src/gui/opengl/qopengltexture.cpp b/src/gui/opengl/qopengltexture.cpp index 6b6d4bcf41..6e2e72a3b4 100644 --- a/src/gui/opengl/qopengltexture.cpp +++ b/src/gui/opengl/qopengltexture.cpp @@ -2441,33 +2441,49 @@ bool QOpenGLTexture::hasFeature(Feature feature) if (!ctx->isOpenGLES()) { switch (feature) { case ImmutableMultisampleStorage: + supported = f.version() >= qMakePair(4, 3) + || ctx->hasExtension(QByteArrayLiteral("GL_ARB_texture_storage_multisample")); + break; + case TextureBuffer: + supported = f.version() >= qMakePair(4, 3) + || (ctx->hasExtension(QByteArrayLiteral("GL_ARB_texture_buffer_object")) + && ctx->hasExtension(QByteArrayLiteral("GL_ARB_texture_buffer_range"))); + break; + case StencilTexturing: - supported = f.version() >= qMakePair(4, 3); + supported = f.version() >= qMakePair(4, 3) + || ctx->hasExtension(QByteArrayLiteral("GL_ARB_stencil_texturing")); break; case ImmutableStorage: - supported = f.version() >= qMakePair(4, 2); + supported = f.version() >= qMakePair(4, 2) + || ctx->hasExtension(QByteArrayLiteral("GL_ARB_texture_storage")); break; case TextureCubeMapArrays: - supported = f.version() >= qMakePair(4, 0); + supported = f.version() >= qMakePair(4, 0) + || ctx->hasExtension(QByteArrayLiteral("ARB_texture_cube_map_array")); break; case Swizzle: - supported = f.version() >= qMakePair(3, 3); + supported = f.version() >= qMakePair(3, 3) + || ctx->hasExtension(QByteArrayLiteral("GL_ARB_texture_swizzle")); break; case TextureMultisample: - supported = f.version() >= qMakePair(3, 2); + supported = f.version() >= qMakePair(3, 2) + || ctx->hasExtension(QByteArrayLiteral("GL_ARB_texture_multisample")); break; case TextureArrays: - supported = f.version() >= qMakePair(3, 0); + supported = f.version() >= qMakePair(3, 0) + || ctx->hasExtension(QByteArrayLiteral("GL_EXT_texture_array")); break; case TextureRectangle: - supported = f.version() >= qMakePair(2, 1); + supported = f.version() >= qMakePair(2, 1) + || ctx->hasExtension(QByteArrayLiteral("ARB_texture_rectangle")); break; case Texture3D: @@ -2798,7 +2814,7 @@ void QOpenGLTexture::setDepthStencilMode(QOpenGLTexture::DepthStencilMode mode) Q_ASSERT(d->texFuncs); Q_ASSERT(d->textureId); if (!d->features.testFlag(StencilTexturing)) { - qWarning("QOpenGLTexture::setDepthStencilMode() requires OpenGL >= 4.3"); + qWarning("QOpenGLTexture::setDepthStencilMode() requires OpenGL >= 4.3 or GL_ARB_stencil_texturing"); return; } d->depthStencilMode = mode; |