From 12769d539cbade306b0b18840d131064b7e50c77 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Tue, 14 Jan 2014 12:48:10 +0100 Subject: [PATCH] Doc: Fix issues with QOpenGLTexture enumerations Use correct parameters for \enum commands, and add documentation for QOpenGLTexture::Filter enumeration. Task-number: QTBUG-35576 Change-Id: If7099da0b2b570c28e683126f0ba3a885d80f741 Reviewed-by: Sean Harmer --- src/gui/opengl/qopengltexture.cpp | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/src/gui/opengl/qopengltexture.cpp b/src/gui/opengl/qopengltexture.cpp index e3fffe5a1c..d9b2e82d0b 100644 --- a/src/gui/opengl/qopengltexture.cpp +++ b/src/gui/opengl/qopengltexture.cpp @@ -1098,6 +1098,17 @@ QOpenGLTexture *QOpenGLTexturePrivate::createTextureView(QOpenGLTexture::Target would be to transform your texture coordinates. */ +/*! + \enum QOpenGLTexture::Filter + This enum defines the filtering parameters for a QOpenGLTexture object. + \value Nearest Equivalent to GL_NEAREST + \value Linear Equivalent to GL_LINEAR + \value NearestMipMapNearest Equivalent to GL_NEAREST_MIPMAP_NEAREST + \value NearestMipMapLinear Equivalent to GL_NEAREST_MIPMAP_LINEAR + \value LinearMipMapNearest Equivalent to GL_LINEAR_MIPMAP_NEAREST + \value LinearMipMapLinear Equivalent to GL_LINEAR_MIPMAP_LINEAR +*/ + /*! \enum QOpenGLTexture::Target This enum defines the texture target of a QOpenGLTexture object. @@ -1152,7 +1163,7 @@ QOpenGLTexture *QOpenGLTexturePrivate::createTextureView(QOpenGLTexture::Target */ /*! - \enum TextureUnitReset + \enum QOpenGLTexture::TextureUnitReset This enum defines options ot control texture unit activation. \value ResetTextureUnit The previous active texture unit will be reset @@ -1308,7 +1319,7 @@ QOpenGLTexture *QOpenGLTexturePrivate::createTextureView(QOpenGLTexture::Target */ /*! - \enum PixelType + \enum QOpenGLTexture::PixelType This enum defines the possible pixel data types for a pixel transfer operation \value NoPixelType Equivalent to GL_NONE @@ -1381,7 +1392,7 @@ QOpenGLTexture *QOpenGLTexturePrivate::createTextureView(QOpenGLTexture::Target */ /*! - \enum WrapMode + \enum QOpenGLTexture::WrapMode This enum defines the possible texture coordinate wrapping modes. \value Repeat Texture coordinate is repeated. Equivalent to GL_REPEAT @@ -1392,7 +1403,7 @@ QOpenGLTexture *QOpenGLTexturePrivate::createTextureView(QOpenGLTexture::Target */ /*! - \enum CoordinateDirection + \enum QOpenGLTexture::CoordinateDirection This enum defines the possible texture coordinate directions \value DirectionS The horizontal direction. Equivalent to GL_TEXTURE_WRAP_S