diff options
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/qopengltexture.cpp | 4 | ||||
| -rw-r--r-- | src/opengl/qopenglwidget.cpp | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/opengl/qopengltexture.cpp b/src/opengl/qopengltexture.cpp index 35d90898e5..49ebdfbec2 100644 --- a/src/opengl/qopengltexture.cpp +++ b/src/opengl/qopengltexture.cpp @@ -1,6 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2013 Klaralvdalens Datakonsult AB (KDAB). +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -2127,6 +2128,7 @@ QOpenGLTexture *QOpenGLTexturePrivate::createTextureView(QOpenGLTexture::Target /*! \enum QOpenGLTexture::Target This enum defines the texture target of a QOpenGLTexture object. + For more information on creating array textures, see \l{Array Texture}. \value Target1D A 1-dimensional texture. Equivalent to GL_TEXTURE_1D. @@ -2134,7 +2136,7 @@ QOpenGLTexture *QOpenGLTexturePrivate::createTextureView(QOpenGLTexture::Target Equivalent to GL_TEXTURE_1D_ARRAY \value Target2D A 2-dimensional texture. Equivalent to GL_TEXTURE_2D - \value Target2DArray An array of 1-dimensional textures. + \value Target2DArray An array of 2-dimensional textures. Equivalent to GL_TEXTURE_2D_ARRAY \value Target3D A 3-dimensional texture. Equivalent to GL_TEXTURE_3D diff --git a/src/opengl/qopenglwidget.cpp b/src/opengl/qopenglwidget.cpp index 91e9fd545d..b334ba867b 100644 --- a/src/opengl/qopenglwidget.cpp +++ b/src/opengl/qopenglwidget.cpp @@ -381,7 +381,7 @@ QT_BEGIN_NAMESPACE This is naturally not the only possible solution. One alternative is to use the \l{QOpenGLContext::aboutToBeDestroyed()}{aboutToBeDestroyed()} signal of QOpenGLContext. By connecting a slot, using direct connection, to this signal, - it is possible to perform cleanup whenever the the underlying native context + it is possible to perform cleanup whenever the underlying native context handle, or the entire QOpenGLContext instance, is going to be released. The following snippet is in principle equivalent to the previous one: |