diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-07-30 13:28:49 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-07-30 13:28:49 (GMT) |
| commit | a08b3f5336e5c819b33d922d3a809b5203d728f3 (patch) | |
| tree | 952f42304d50f28ed6651bace587ab7935b29cd0 /src/opengl/qglframebufferobject.cpp | |
| parent | 813fc3574a006cb2687715ccf7bdb984a485b173 (diff) | |
| parent | 188ac02e2fb6cc6437b776f8c5b69a508728fbdb (diff) | |
| download | Qt-a08b3f5336e5c819b33d922d3a809b5203d728f3.zip Qt-a08b3f5336e5c819b33d922d3a809b5203d728f3.tar.gz Qt-a08b3f5336e5c819b33d922d3a809b5203d728f3.tar.bz2 | |
Merge commit 'qt/master-stable'
Conflicts:
demos/demos.pro
src/gui/graphicsview/qgraphicsitem_p.h
Diffstat (limited to 'src/opengl/qglframebufferobject.cpp')
| -rw-r--r-- | src/opengl/qglframebufferobject.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/opengl/qglframebufferobject.cpp b/src/opengl/qglframebufferobject.cpp index f8607cc..0577f9a 100644 --- a/src/opengl/qglframebufferobject.cpp +++ b/src/opengl/qglframebufferobject.cpp @@ -745,8 +745,11 @@ QGLFramebufferObject::~QGLFramebufferObject() The framebuffer can become invalid if the initialization process fails, the user attaches an invalid buffer to the framebuffer - object, or a non-power of 2 width/height is specified as the + object, or a non-power of two width/height is specified as the texture size if the texture target is \c{GL_TEXTURE_2D}. + The non-power of two limitation does not apply if the OpenGL version + is 2.0 or higher, or if the GL_ARB_texture_non_power_of_two extension + is present. */ bool QGLFramebufferObject::isValid() const { |