diff options
| -rw-r--r-- | doc/global/externalsites/external-resources.qdoc | 7 | ||||
| -rw-r--r-- | src/gui/opengl/qopengltexture.cpp | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/doc/global/externalsites/external-resources.qdoc b/doc/global/externalsites/external-resources.qdoc index 1c3d37c199..cbb4345bcd 100644 --- a/doc/global/externalsites/external-resources.qdoc +++ b/doc/global/externalsites/external-resources.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the documentation of the Qt Toolkit. @@ -483,6 +483,11 @@ */ /*! + \externalpage https://www.khronos.org/opengl/wiki/Array_Texture + \title Array Texture +*/ + +/*! \externalpage https://github.com/iksaif/qsslkey-p11 \title qsslkey example */ diff --git a/src/gui/opengl/qopengltexture.cpp b/src/gui/opengl/qopengltexture.cpp index 61a6202017..6b476622e2 100644 --- a/src/gui/opengl/qopengltexture.cpp +++ b/src/gui/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. @@ -2126,6 +2127,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. @@ -2133,7 +2135,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 |