summaryrefslogtreecommitdiffstats
path: root/src/opengl/qgl_p.h
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'c1f9978c9d61bcbdb2f280185a3abdea13d7f532' into master-from-4.7Rohan McGovern2010-10-051-0/+3
|\
| * Don't disable texture_from_pixmap on GLX/X11 by default.Trond Kjernåsen2010-09-271-0/+3
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-281-3/+0
|\ \ | |/
| * Don't try to use the texture_from_pixmap extension in GL on desktop/X11.Trond Kjernåsen2010-09-231-3/+0
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-301-1/+2
|\ \ | |/
| * Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-08-261-1/+2
| |\
| | * Don't define highp/mediump/lowp if desktop GL has themRhys Weatherley2010-08-131-1/+2
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-251-1/+11
|\ \ \ | |/ /
| * | Introduce QtOpenGL module for Symbian.Jani Hautakangas2010-08-201-1/+8
| * | Prevented Xorg crash in qtdemo when running corkboards example.Samuel Rødal2010-08-171-0/+3
* | | Merge remote branch 'origin/master' into qt-master-from-4.7Thiago Macieira2010-07-151-1/+1
|\ \ \
| * | | Compile with qmlscene.Bjørn Erik Nilsen2010-07-151-1/+1
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-07-151-1/+2
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | QGLWindowSurface support for partial updates via EGL_NOK_swap_region2Michael Dominic K2010-07-011-0/+1
| * | Export various symbols needed to make a custom GL graphicssystem.Michael Dominic K2010-06-301-1/+1
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-06-281-1/+1
| |\ \
| | * | Need to access extensionFuncs in subclasses too.Michael Dominic K2010-06-251-1/+1
* | | | 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-18/+143
|\ \ \ \ | |/ / / |/| | |
| * | | Fix the tests for the internal GL resource system.Trond Kjernåsen2010-07-021-2/+2
| * | | Rework the internal GL resource system yet again.Trond Kjernåsen2010-07-021-14/+123
| * | | Unnecessary alloc + remove unused headers.Trond Kjernåsen2010-07-021-6/+2
| * | | Remove the DDS texture cache.Trond Kjernåsen2010-07-021-3/+0
| * | | Redesigned how GL resource management works.Trond Kjernåsen2010-07-021-7/+25
| * | | Don't use the QGLSignalProxy to clean up the thread-local shaders.Trond Kjernåsen2010-07-021-0/+2
| * | | More work on GL threading.Trond Kjernåsen2010-07-021-0/+3
* | | | Merge branch '4.6-s60' into 4.7-s60axis2010-06-241-1/+1
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | Ensure that compiling with the no debug/warning output defines worksAndy Shaw2010-06-231-1/+1
* | | Fixed an on-exit crash for apps using GL.Trond Kjernåsen2010-06-111-0/+4
| |/ |/|
* | Fixed a problem where QPixmaps where re-bound in non-sharing contexts.Trond Kjernåsen2010-06-011-13/+23
* | Added workarounds for two MBX/SGX specific GL ES bugs/problems.Trond Kjernåsen2010-05-141-1/+7
* | Make sure recreateEglSurface creates a surface if there isn't oneTom Cooksey2010-04-221-1/+1
* | Support building with desktop OpenGL managed via EGLTom Cooksey2010-04-141-5/+5
* | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7David Boddie2010-03-301-41/+56
|\ \ | |/ |/|
| * Avoid having to create temporary QPixmaps when binding to textureTom Cooksey2010-03-261-1/+1
| * Made QGLExtensions::glExtensions() thread-safe.Trond Kjernåsen2010-03-121-2/+0
| * Delete the QGLContext in ~QX11GLPixmapDataTom Cooksey2010-03-111-0/+1
| * Made QGLTextureCache::instance() threadsafe.Trond Kjernåsen2010-03-111-1/+0
| * Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Rohan McGovern2010-03-061-1/+1
| |\
| * | Fix build when egl.h includes X11 headers & pollutes namespaceTom Cooksey2010-03-041-7/+1
| * | Add and use QGLContextPrivate::eglSurfaceForDevice()Tom Cooksey2010-03-021-0/+1
| * | Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-201-6/+36
| |\ \
| | * | Some threading improvements to the GL moduleGunnar Sletta2010-02-171-6/+36
| * | | Merge branch '4.6' into qt-master-from-4.6Thiago Macieira2010-02-171-2/+2
| |\ \ \ | | |/ / | |/| |
| * | | Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-121-1/+3
| |\ \ \
| * \ \ \ Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-091-6/+3
| |\ \ \ \
| * | | | | Remove obsolete OpenGL/ES CommonLite (fixed-point) supportRhys Weatherley2010-02-041-16/+0
| * | | | | Merge branch '4.6'Thiago Macieira2010-01-181-36/+59
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch '4.6'Thiago Macieira2010-01-131-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch '4.6'Thiago Macieira2010-01-081-16/+18
| |\ \ \ \ \ \ \