diff options
| author | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-08-27 16:30:55 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-08-27 15:38:07 +0000 |
| commit | 4af1bb24648f37340695ff558b26e8ddad5ef939 (patch) | |
| tree | b1302479658edef9b95d1b9f0ccee77749a08bff | |
| parent | 74c8aac8f6e22d7fb84d98cc7a5bf44bc3a50c51 (diff) | |
Remove VAO assert from GL2 helper
GraphicsContext contains appropriate checks for VAO support. Asserting
here is not necessary, especially considering that the ARB extension
is never present on OS X (with older machines at least).
This assert should have been removed together with the introduction
of VAO-less rendering support for ES2.
This allows running Qt 3D apps with a default 2.0 context on OS X
in case only the APPLE extension is available.
Change-Id: If3dbf4548de65751bc214706e9569e2b7b42e326
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| -rw-r--r-- | src/render/backend/qgraphicshelpergl2.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/render/backend/qgraphicshelpergl2.cpp b/src/render/backend/qgraphicshelpergl2.cpp index b3ef699bc..4c80c6214 100644 --- a/src/render/backend/qgraphicshelpergl2.cpp +++ b/src/render/backend/qgraphicshelpergl2.cpp @@ -62,8 +62,6 @@ void QGraphicsHelperGL2::initializeHelper(QOpenGLContext *context, const bool ok = m_funcs->initializeOpenGLFunctions(); Q_ASSERT(ok); Q_UNUSED(ok); - // Check Vertex Array Object extension is present - Q_ASSERT(context->hasExtension(QByteArrayLiteral("GL_ARB_vertex_array_object"))); if (context->hasExtension(QByteArrayLiteral("GL_ARB_framebuffer_object"))) { m_fboFuncs = new QOpenGLExtension_ARB_framebuffer_object(); const bool extensionOk = m_fboFuncs->initializeOpenGLFunctions(); |