diff options
author | Martin Smith <msmith@trolltech.com> | 2009-08-28 10:28:08 (GMT) |
---|---|---|
committer | Martin Smith <msmith@trolltech.com> | 2009-08-28 10:28:54 (GMT) |
commit | 67f4c288107fd4e7003df6f882143afa8819844b (patch) | |
tree | c51adf29dae7cb5f99667d7af7a58faa9b73020e /src/opengl/qgl.cpp | |
parent | d55715cc07e4ae2ad4584f7bc5f38be2dd1c3613 (diff) | |
download | Qt-67f4c288107fd4e7003df6f882143afa8819844b.zip Qt-67f4c288107fd4e7003df6f882143afa8819844b.tar.gz Qt-67f4c288107fd4e7003df6f882143afa8819844b.tar.bz2 |
doc: Fixed several qdoc errors.
Diffstat (limited to 'src/opengl/qgl.cpp')
-rw-r--r-- | src/opengl/qgl.cpp | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index 02991d9..8cf3b45 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -2179,6 +2179,9 @@ GLuint QGLContext::bindTexture(const QImage &image, GLenum target, GLint format) The \a format parameter sets the internal format for the texture. The default format is \c GL_RGBA. + The binding \a options are a set of options used to decide how to + bind the texture to the context. + The texture that is generated is cached, so multiple calls to bindTexture() with the same QImage will return the same texture id. @@ -2229,7 +2232,7 @@ GLuint QGLContext::bindTexture(const QPixmap &pixmap, GLenum target, GLint forma \overload Generates and binds a 2D GL texture to the current context, based - on \a image. + on \a pixmap. */ GLuint QGLContext::bindTexture(const QPixmap &pixmap, GLenum target, GLint format, BindOptions options) { @@ -4254,8 +4257,12 @@ GLuint QGLWidget::bindTexture(const QImage &image, GLenum target, GLint format) return d->glcx->bindTexture(image, target, format, QGLContext::DefaultBindOption); } +/*! + \overload - + The binding \a options are a set of options used to decide how to + bind the texture to the context. + */ GLuint QGLWidget::bindTexture(const QImage &image, GLenum target, GLint format, QGLContext::BindOptions options) { Q_D(QGLWidget); @@ -4291,6 +4298,15 @@ GLuint QGLWidget::bindTexture(const QPixmap &pixmap, GLenum target, GLint format return d->glcx->bindTexture(pixmap, target, format, QGLContext::DefaultBindOption); } +/*! + \overload + + Generates and binds a 2D GL texture to the current context, based + on \a pixmap. The generated texture id is returned and can be used in + + The binding \a options are a set of options used to decide how to + bind the texture to the context. + */ GLuint QGLWidget::bindTexture(const QPixmap &pixmap, GLenum target, GLint format, QGLContext::BindOptions options) { |