diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-05-11 12:19:37 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-05-11 15:36:31 (GMT) |
| commit | 9e0bfde7cdb439d9ef416cd932340a90cc61abb8 (patch) | |
| tree | adc0bc5c33838f9d48e0d72e9e59dc3112a6edd0 /src/opengl | |
| parent | 4f6ccce6ad8b6df523fd354aac2bcd32a7a65bc4 (diff) | |
| download | Qt-9e0bfde7cdb439d9ef416cd932340a90cc61abb8.zip Qt-9e0bfde7cdb439d9ef416cd932340a90cc61abb8.tar.gz Qt-9e0bfde7cdb439d9ef416cd932340a90cc61abb8.tar.bz2 | |
Doc: Fixed qdoc warnings.
Diffstat (limited to 'src/opengl')
| -rw-r--r-- | src/opengl/qgl_qpa.cpp | 4 | ||||
| -rw-r--r-- | src/opengl/qgl_x11.cpp | 4 | ||||
| -rw-r--r-- | src/opengl/qglframebufferobject.cpp | 9 | ||||
| -rw-r--r-- | src/opengl/qglpixelbuffer.cpp | 2 |
4 files changed, 11 insertions, 8 deletions
diff --git a/src/opengl/qgl_qpa.cpp b/src/opengl/qgl_qpa.cpp index 994344c..24a4f5e 100644 --- a/src/opengl/qgl_qpa.cpp +++ b/src/opengl/qgl_qpa.cpp @@ -378,6 +378,10 @@ QGLContext::QGLContext(QPlatformGLContext *platformContext) d->setupSharing(); } +/*! + Returns a OpenGL context for the platform-specific OpenGL context given by + \a platformContext. +*/ QGLContext *QGLContext::fromPlatformGLContext(QPlatformGLContext *platformContext) { if (!platformContext) diff --git a/src/opengl/qgl_x11.cpp b/src/opengl/qgl_x11.cpp index 9b52003..9e170ad 100644 --- a/src/opengl/qgl_x11.cpp +++ b/src/opengl/qgl_x11.cpp @@ -1407,10 +1407,6 @@ bool QGLWidgetPrivate::renderCxPm(QPixmap* pm) return true; } -/*! \internal - Free up any allocated colormaps. This fn is only called for - top-level widgets. -*/ void QGLWidgetPrivate::cleanupColormaps() { if (!cmap.handle()) { diff --git a/src/opengl/qglframebufferobject.cpp b/src/opengl/qglframebufferobject.cpp index 8eda222..d882916 100644 --- a/src/opengl/qglframebufferobject.cpp +++ b/src/opengl/qglframebufferobject.cpp @@ -205,13 +205,16 @@ int QGLFramebufferObjectFormat::samples() const /*! \since 4.8 - Enables or disables mipmapping. Mipmapping is disabled by default. + Enables mipmapping if \a enabled is true; otherwise disables it. + + Mipmapping is disabled by default. + If mipmapping is enabled, additional memory will be allocated for the mipmap levels. The mipmap levels can be updated by binding the texture and calling glGenerateMipmap(). Mipmapping cannot be enabled for multisampled framebuffer objects. - \sa mipmap(), texture() + \sa mipmap(), QGLFramebufferObject::texture() */ void QGLFramebufferObjectFormat::setMipmap(bool enabled) { @@ -713,7 +716,7 @@ void QGLFramebufferObjectPrivate::init(QGLFramebufferObject *q, const QSize &sz, as a texture, you first need to copy from it to a regular framebuffer object using QGLContext::blitFramebuffer(). - \section Threading + \section1 Threading As of Qt 4.8, it's possible to draw into a QGLFramebufferObject using a QPainter in a separate thread. Note that OpenGL 2.0 or diff --git a/src/opengl/qglpixelbuffer.cpp b/src/opengl/qglpixelbuffer.cpp index 3278596..265d598 100644 --- a/src/opengl/qglpixelbuffer.cpp +++ b/src/opengl/qglpixelbuffer.cpp @@ -77,7 +77,7 @@ \endlist - \section Threading + \section1 Threading As of Qt 4.8, it's possible to render into a QGLPixelBuffer using a QPainter in a separate thread. Note that OpenGL 2.0 or OpenGL ES |