Qt.git - Qt s a cross-platform application framework that is used for developing application software that can be run on various software and hardware platforms with little or no change in the underlying codebase, while still being a native application with native capabilities and speed.

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6	Gunnar Sletta	2009-10-19	1	-1/+1
\|\
\| *	Don't delete an fbo's texture if the fbo isn't using a texture	Rhys Weatherley	2009-10-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Also, unbind the texture after it is initialized. Reviewed-by: Sarah Smith
* \|	Fixed bug when using QGLWidgets in -graphicssystem opengl	Samuel Rødal	2009-10-12	1	-1/+1
\|/ \| \| \| \| \|	We need to make sure that the FBO is bound in a valid context. Reviewed-by: Tom
*	Make QGLFramebufferObject crash-proof if QGLContext destroyed first	Rhys Weatherley	2009-10-01	1	-3/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sometimes it isn't possible to arrange for the QGLFramebufferObject to be destroyed before the QGLContext group in which it was created. Especially during application shutdown or in applications with multiple shared contexts. This change modifies QGLFramebufferObject to use QGLSharedResourceGuard, which ensures that when the last QGLContext in a sharing group is destroyed, any remaining FBO's will revert to !isValid(). It is now safe to destroy the context before the FBO, or the FBO before the context. Unit test included. Reviewed-by: Sarah Smith
*	Return the correct QGLFormat to the OpenGL1 paint engine for FBO's	Rhys Weatherley	2009-09-10	1	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \|	QGLPaintDevice::format() was returning the context's format, not the format of the window surface's FBO. This caused the OpenGL1 paint engine to think that the window didn't have depth and stencil buffers, even though the FBO most certainly did. This change makes QGLPaintDevice::format() virtual and overrides it in QGLFBOGLPaintDevice to return an updated format that includes the context parameters plus the extra features that the FBO supports. Reviewed-by: Tom Cooksey
*	Update license headers again.	Jason McDonald	2009-09-09	1	-4/+4
\| \| \| \|	Reviewed-by: Trust Me
*	Make QGLPixmapData work with the new QGLPaintDevice API	Tom Cooksey	2009-09-08	1	-1/+2
\| \| \| \| \| \| \| \| \| \|	This patch changes the ordering of QGL2PaintEngine::begin a bit because QGLPixmapData needs to use the paint engine's drawTexture method within beginPaint(). Also, this initialises needsSync to true and removes the setState call. So now all the state initialisation is done in ensureActive rather than begin.
*	Make QGLFramebufferObject work again using new QGLPaintDevice API	Tom Cooksey	2009-09-08	1	-0/+151
	This patch also refactors QGL2PaintEngineEx::ensureActive() and the logic which handles multiple paint engines rendering to the same QGLContext. In a nut-shell: * QGLPaintDevice::beginPaint() stores the currently bound FBO * QGLPaintDevice::ensureActiveTarget() makes sure that GL rendering will end up in the paint device (I.e. the right context is current and the right FBO is bound). If a different context or FBO was bound, it is _not_ remembered. * QGLPaintDevice::endPaint() restores whatever FBO was bound when beginPaint() was called. This logic allows interleaved painter rendering to multiple FBOs and contexts to work as expected. It also allows a stacked begin/end to work properly when it's mixed with native GL rendering (as far as current render target is concerened. GL state clobbering is obviously a different topic). QGLPaintDevice::context() also had to be made virtual as there's no good place to call setContext. This might be possible to change in the future though. Finally, to make this work, QGLFramebufferObjectPrivate had to be moved into it's own private header.