diff options
| author | Paul Olav Tvete <paul.tvete@qt.io> | 2020-06-08 16:36:20 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@qt.io> | 2020-06-10 06:02:09 +0200 |
| commit | 8ae0cb9815e751dcb3d35022ff2aa3dff6db5e61 (patch) | |
| tree | 13e9c59b5e966180c8ab518cb3b1a90ea665e6f9 /src/quick/scenegraph/coreapi/qsggeometry.cpp | |
| parent | bb906cecec40b7de6a39d97f7c07a883de40195d (diff) | |
Remove OpenGL dependency from QSGGeometry
Task-number: QTBUG-84623
Change-Id: I150867f256a1e9f30d66e8b6d8cde047d7b6dbdf
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'src/quick/scenegraph/coreapi/qsggeometry.cpp')
| -rw-r--r-- | src/quick/scenegraph/coreapi/qsggeometry.cpp | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/quick/scenegraph/coreapi/qsggeometry.cpp b/src/quick/scenegraph/coreapi/qsggeometry.cpp index a28eee5288..2e1cfebc6e 100644 --- a/src/quick/scenegraph/coreapi/qsggeometry.cpp +++ b/src/quick/scenegraph/coreapi/qsggeometry.cpp @@ -39,11 +39,6 @@ #include "qsggeometry.h" #include "qsggeometry_p.h" -#if QT_CONFIG(opengl) -# include <qopenglcontext.h> -# include <qopenglfunctions.h> -# include <private/qopenglextensions_p.h> -#endif #ifdef Q_OS_QNX #include <malloc.h> @@ -441,15 +436,6 @@ QSGGeometry::QSGGeometry(const QSGGeometry::AttributeSet &attributes, Q_UNUSED(m_reserved_bits); Q_ASSERT(m_attributes.count > 0); Q_ASSERT(m_attributes.stride > 0); -#if QT_CONFIG(opengl) - Q_ASSERT_X(indexType != GL_UNSIGNED_INT - || !QOpenGLContext::currentContext() // rhi, support for uint cannot be checked here - || static_cast<QOpenGLExtensions *>(QOpenGLContext::currentContext()->functions()) - ->hasOpenGLExtension(QOpenGLExtensions::ElementIndexUint), - "QSGGeometry::QSGGeometry", - "GL_UNSIGNED_INT is not supported, geometry will not render" - ); -#endif if (indexType != UnsignedByteType && indexType != UnsignedShortType && indexType != UnsignedIntType) { |