summaryrefslogtreecommitdiffstats
path: root/src/opengl/qgl.cpp
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-261-1/+1
|\
| * Added support for blitting to native child widgets in GL window surface.Samuel Rødal2010-10-221-1/+1
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-251-0/+6
|\ \ | |/
| * Fix GL_OES_element_index_uint and add GL_OES_depth24 detection.Jani Hautakangas2010-10-201-0/+6
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-121-3/+0
|\ \ | |/
| * Revert "Don't define highp/mediump/lowp if desktop GL has them"Trond Kjernåsen2010-10-121-3/+0
* | Merge commit 'c1f9978c9d61bcbdb2f280185a3abdea13d7f532' into master-from-4.7Rohan McGovern2010-10-051-7/+29
|\ \ | |/
| * Don't disable texture_from_pixmap on GLX/X11 by default.Trond Kjernåsen2010-09-271-7/+26
| * Don't pretend to support single buffered EGL surfaces.Trond Kjernåsen2010-09-241-0/+3
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-281-26/+7
|\ \ | |/
| * Don't try to use the texture_from_pixmap extension in GL on desktop/X11.Trond Kjernåsen2010-09-231-26/+7
* | Fixes makeCurrent() failed messages on several systems.Trond Kjernåsen2010-09-161-3/+2
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-101-5/+4
|\ \ | |/
| * Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-09-071-0/+2
| |\
| | * Recognize GL_ARB_shader_objects as indicating shadersRhys Weatherley2010-08-271-0/+2
| * | Made QT_GL_SWAPBUFFER_PRESERVE=1 with the GL graphics system work.Samuel Rødal2010-08-311-5/+2
* | | Doc update regarding threaded painting with QPainter in the QGL module.Trond Kjernåsen2010-09-091-9/+83
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-08-311-6/+10
|\ \ \
| * | | Doc update: Mention the Qt::AA_X11InitThreads application attribute.Trond Kjernåsen2010-08-301-6/+10
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-301-0/+3
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-08-261-0/+3
| |\ \ | | |/
| | * Fix OpenGLVersionFlags on OpenGL 4.0 systemsRhys Weatherley2010-08-161-2/+10
| | * Don't define highp/mediump/lowp if desktop GL has themRhys Weatherley2010-08-131-0/+3
* | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-08-251-12/+78
|\ \ \
| * \ \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-251-12/+78
| |\ \ \ | | |/ /
| | * | On Symbian QGLWidget::glDraw() must do nothing if widget isn't visible.Jani Hautakangas2010-08-231-0/+5
| | * | bindTexture: Replace texture if painting is active on pixmap/imageAndreas Kling2010-08-211-5/+18
| | * | Introduce QtOpenGL module for Symbian.Jani Hautakangas2010-08-201-2/+30
| | * | Prevented Xorg crash in qtdemo when running corkboards example.Samuel Rødal2010-08-171-5/+25
* | | | Call eglReleaseThread() when a thread exits, and fix warnings.Trond Kjernåsen2010-08-241-0/+5
|/ / /
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-131-1/+1
|\ \ \ | |/ /
| * | Correcting spelling mistakes in documentation. Part of fix for QTBUG-11938.Jerome Pasion2010-08-091-1/+1
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-07-281-5/+11
|\ \ \ | |/ /
| * | Merge remote branch 'origin/4.7' into 4.7-from-4.6Rohan McGovern2010-07-171-4/+10
| |\ \
| | * | doc: Fixed several qdoc warnings.Martin Smith2010-07-131-4/+10
| * | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-07-151-1/+1
| |\ \ \ | | |/ / | |/| / | | |/
| | * The Q_WGL define was removed years ago.Trond Kjernåsen2010-07-081-1/+1
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-07-151-14/+33
|\ \ \ | |/ /
| * | Got rid of unused variable compiler warning.Samuel Rødal2010-07-011-1/+1
| * | QGLWindowSurface support for partial updates via EGL_NOK_swap_region2Michael Dominic K2010-07-011-0/+10
| * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Gunnar Sletta2010-06-301-0/+33
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-271-0/+7
| | |\ \
| | | * | Need to access extensionFuncs in subclasses too.Michael Dominic K2010-06-251-0/+7
| * | | | support BGRA textures on SGXGunnar Sletta2010-06-301-14/+16
| | |/ / | |/| |
* | | | Track the GL DCs we use across different threads under Windows.Trond Kjernåsen2010-07-081-0/+1
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-07-061-52/+50
|\ \ \ \ | |_|/ / |/| | |
| * | | The group pointer should no longer be a part of the 64 bit int.Trond Kjernåsen2010-07-021-2/+2
| * | | Clean up debug output.Trond Kjernåsen2010-07-021-6/+14
| * | | Rework the internal GL resource system yet again.Trond Kjernåsen2010-07-021-12/+22
| * | | QGLPixelBuffer should manage its own paint engines.Trond Kjernåsen2010-07-021-2/+0