From 0b26ad05bbadeef493317c994cc7ccb53b0a612c Mon Sep 17 00:00:00 2001 From: Nico Vertriest Date: Thu, 23 Jan 2014 16:10:26 +0100 Subject: Doc: corrected link/example errors Update pro files after move gestures folder Update snippet statements Corrected path in imagegestures.pro Task-number: QTBUG-34749 Change-Id: Icc19908914e36507e412ab63bf0cc2809aa48e17 Reviewed-by: Jerome Pasion --- src/opengl/doc/src/qtopengl-examples.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/opengl') diff --git a/src/opengl/doc/src/qtopengl-examples.qdoc b/src/opengl/doc/src/qtopengl-examples.qdoc index 67c6aa3c0d..694b7ab8b8 100644 --- a/src/opengl/doc/src/qtopengl-examples.qdoc +++ b/src/opengl/doc/src/qtopengl-examples.qdoc @@ -34,7 +34,7 @@ \image opengl-examples.png These examples describe how to use the Qt OpenGL Module. For new code, - please use the OpenGL classes in the \l {Qt GUI Module}. + please use the OpenGL classes in the \l QtGui module. Qt provides support for integration with OpenGL implementations on all -- cgit v1.2.3 From 8bb5dba0cba4d953794124d7f1b33887d1b5bd8d Mon Sep 17 00:00:00 2001 From: Sze Howe Koh Date: Sat, 1 Feb 2014 23:30:08 +0800 Subject: Doc: Fix broken links Change-Id: Ic275dfbf0b332fc34ea0fac1c31c4935ad961527 Reviewed-by: Frederik Gladhorn --- src/opengl/doc/src/qtopengl-examples.qdoc | 5 ++--- src/opengl/qglframebufferobject.cpp | 2 +- src/opengl/qglpixelbuffer.cpp | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) (limited to 'src/opengl') diff --git a/src/opengl/doc/src/qtopengl-examples.qdoc b/src/opengl/doc/src/qtopengl-examples.qdoc index 694b7ab8b8..68adcda173 100644 --- a/src/opengl/doc/src/qtopengl-examples.qdoc +++ b/src/opengl/doc/src/qtopengl-examples.qdoc @@ -33,9 +33,8 @@ \image opengl-examples.png - These examples describe how to use the Qt OpenGL Module. For new code, - please use the OpenGL classes in the \l QtGui module. - + These examples describe how to use the \l {Qt OpenGL} module. For new code, + please use the OpenGL classes in the \l {Qt GUI} module. Qt provides support for integration with OpenGL implementations on all platforms, giving developers the opportunity to display hardware accelerated diff --git a/src/opengl/qglframebufferobject.cpp b/src/opengl/qglframebufferobject.cpp index fa3f653aee..f42ee40211 100644 --- a/src/opengl/qglframebufferobject.cpp +++ b/src/opengl/qglframebufferobject.cpp @@ -779,7 +779,7 @@ void QGLFramebufferObjectPrivate::init(QGLFramebufferObject *q, const QSize &sz, \note This class has been deprecated in favor of QOpenGLFramebufferObject. - \sa {Framebuffer Object Example} + \sa {Framebuffer Object 2 Example} */ diff --git a/src/opengl/qglpixelbuffer.cpp b/src/opengl/qglpixelbuffer.cpp index bcb2dd53db..ebc9f296eb 100644 --- a/src/opengl/qglpixelbuffer.cpp +++ b/src/opengl/qglpixelbuffer.cpp @@ -90,7 +90,7 @@ Pbuffers are provided by the OpenGL \c pbuffer extension; call hasOpenGLPbuffer() to find out if the system provides pbuffers. - \sa {opengl/pbuffers}{Pbuffers Example} + \sa {Pixel Buffers Example} */ #include -- cgit v1.2.3 From 2c1e77506ccd22f9d9be4f79875539a630f4f576 Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Wed, 5 Feb 2014 18:01:08 +0100 Subject: Do not check for !IsRenderBuffer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Unlike the newer QOpenGLFramebufferObject, QGLFramebufferObject still contains some unfortunate tests for !IsRenderBuffer when creating renderbuffers. Removing these tests avoids asserting in debug builds on drivers that are not conformant to the GL spec in this respect. This means that the qgl autotest is now passing on such drivers too. The tests do not make much sense in the first place since Qt is not a conformance test suite. Change-Id: I21d6272cd5cef9dd71eab57e46771d3ce7dacbfb Reviewed-by: Jørgen Lind --- src/opengl/qglframebufferobject.cpp | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/opengl') diff --git a/src/opengl/qglframebufferobject.cpp b/src/opengl/qglframebufferobject.cpp index f42ee40211..a9871967f2 100644 --- a/src/opengl/qglframebufferobject.cpp +++ b/src/opengl/qglframebufferobject.cpp @@ -554,7 +554,6 @@ void QGLFramebufferObjectPrivate::init(QGLFramebufferObject *q, const QSize &sz, && funcs.hasOpenGLExtension(QOpenGLExtensions::PackedDepthStencil)) { // depth and stencil buffer needs another extension funcs.glGenRenderbuffers(1, &depth_buffer); - Q_ASSERT(!funcs.glIsRenderbuffer(depth_buffer)); funcs.glBindRenderbuffer(GL_RENDERBUFFER, depth_buffer); Q_ASSERT(funcs.glIsRenderbuffer(depth_buffer)); if (samples != 0 && funcs.hasOpenGLExtension(QOpenGLExtensions::FramebufferMultisample)) @@ -581,7 +580,6 @@ void QGLFramebufferObjectPrivate::init(QGLFramebufferObject *q, const QSize &sz, || (attachment == QGLFramebufferObject::Depth))) { funcs.glGenRenderbuffers(1, &depth_buffer); - Q_ASSERT(!funcs.glIsRenderbuffer(depth_buffer)); funcs.glBindRenderbuffer(GL_RENDERBUFFER, depth_buffer); Q_ASSERT(funcs.glIsRenderbuffer(depth_buffer)); if (samples != 0 && funcs.hasOpenGLExtension(QOpenGLExtensions::FramebufferMultisample)) { @@ -621,7 +619,6 @@ void QGLFramebufferObjectPrivate::init(QGLFramebufferObject *q, const QSize &sz, if (stencil_buffer == 0 && (attachment == QGLFramebufferObject::CombinedDepthStencil)) { funcs.glGenRenderbuffers(1, &stencil_buffer); - Q_ASSERT(!funcs.glIsRenderbuffer(stencil_buffer)); funcs.glBindRenderbuffer(GL_RENDERBUFFER, stencil_buffer); Q_ASSERT(funcs.glIsRenderbuffer(stencil_buffer)); if (samples != 0 && funcs.hasOpenGLExtension(QOpenGLExtensions::FramebufferMultisample)) { -- cgit v1.2.3