1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed error in QGLFramebufferObject and QOpenGLFramebufferObject docs.

Browse Source 
It's the format class that lets you control the number of samples.

Change-Id: Id01f107a15787f33b65429d3c882854f2dc8784e
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
This commit is contained in:
Samuel Rødal 2013-02-14 09:57:56 +01:00 committed by The Qt Project
parent 02a1243dda
commit 783ad64b90
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/opengl/qopenglframebufferobject.cpp
View File

@ -702,8 +702,8 @@ void QOpenGLFramebufferObjectPrivate::initAttachments(QOpenGLContext *ctx, QOpen
create a QOpenGLFramebufferObject with more than one sample per pixel for create a QOpenGLFramebufferObject with more than one sample per pixel for
primitives to be antialiased when drawing using a QPainter. To create a primitives to be antialiased when drawing using a QPainter. To create a
multisample framebuffer object you should use one of the constructors that multisample framebuffer object you should use one of the constructors that
take a QOpenGLFramebufferObject parameter, and set the take a QOpenGLFramebufferObjectFormat parameter, and set the
QOpenGLFramebufferObject::samples() property to a non-zero value. QOpenGLFramebufferObjectFormat::samples() property to a non-zero value.
For multisample framebuffer objects a color render buffer is created, For multisample framebuffer objects a color render buffer is created,
otherwise a texture with the specified texture target is created. otherwise a texture with the specified texture target is created.

4
src/opengl/qglframebufferobject.cpp
View File

@ -751,8 +751,8 @@ void QGLFramebufferObjectPrivate::init(QGLFramebufferObject *q, const QSize &sz,
Note that you need to create a QGLFramebufferObject with more than one Note that you need to create a QGLFramebufferObject with more than one
sample per pixel for primitives to be antialiased when drawing using a sample per pixel for primitives to be antialiased when drawing using a
QPainter. To create a multisample framebuffer object you should use one of QPainter. To create a multisample framebuffer object you should use one of
the constructors that take a QGLFramebufferObject parameter, and set the the constructors that take a QGLFramebufferObjectFormat parameter, and set
QGLFramebufferObject::samples() property to a non-zero value. the QGLFramebufferObjectFormat::samples() property to a non-zero value.
When painting to a QGLFramebufferObject using QPainter, the state of When painting to a QGLFramebufferObject using QPainter, the state of
the current GL context will be altered by the paint engine to reflect the current GL context will be altered by the paint engine to reflect