summaryrefslogtreecommitdiffstats
path: root/src/opengl
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-10-052-24/+25
|\
| * Work around OpenGL driver reading arrays asyncronouslyEskil Abrahamsen Blomfeldt2010-10-052-24/+25
* | Merge commit 'c1f9978c9d61bcbdb2f280185a3abdea13d7f532' into master-from-4.7Rohan McGovern2010-10-055-14/+51
|\ \ | |/ |/|
| * Work around an ATI driver problem with mutli-sampled pbuffers.Trond Kjernåsen2010-09-281-11/+18
| * Don't disable texture_from_pixmap on GLX/X11 by default.Trond Kjernåsen2010-09-272-7/+29
| * Don't pretend to support single buffered EGL surfaces.Trond Kjernåsen2010-09-242-0/+4
| * Named anonymous struct in the OpenGL paint engine.Kim Motoyoshi Kalland2010-09-241-2/+2
* | Merge remote branch 'origin/4.7' into master-from-4.7Rohan McGovern2010-10-044-27/+78
|\ \
| * | Fallback to A8 text rendering on Mac when LCD smoothing is disabledAaron Kennedy2010-09-291-0/+7
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-09-286-88/+92
| |\ \ | | |/
| * | Minimize parameter changes on glyph cache texturesAaron Kennedy2010-09-283-5/+32
| * | Only set maskTexture sampler uniform onceAaron Kennedy2010-09-282-6/+13
| * | Only repopulate the glyph cache when we know something could have changedAaron Kennedy2010-09-281-11/+16
| * | Remove unnecessary attribute changesAaron Kennedy2010-09-231-2/+0
| * | Invalidate QStaticText coord cache when texture size changesAaron Kennedy2010-09-231-1/+8
* | | Make texture glyph cache on OpenGL work without a paint engineEskil Abrahamsen Blomfeldt2010-09-292-12/+67
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-286-88/+92
|\ \ \ | | |/ | |/|
| * | Don't try to use the texture_from_pixmap extension in GL on desktop/X11.Trond Kjernåsen2010-09-232-29/+7
| * | Compile on Symbian - rework the X11 mask patch a bit.Trond Kjernåsen2010-09-231-2/+2
| * | Fix compilationOlivier Goffart2010-09-221-2/+2
| * | Fixed drawing of QPixmaps with masks in the GL 2 and X11 engines.Trond Kjernåsen2010-09-222-1/+5
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-223-57/+79
| |\ \ | | |/ | |/|
| | * Revert "Fixed painter path drawing on FBO without stencil buffer."Kim Motoyoshi Kalland2010-09-222-30/+0
| | * Fixed stencil buffer on FBOs with OpenGL ES.Kim Motoyoshi Kalland2010-09-222-27/+79
* | | Fix problems in QTextureGlyphCache caused by insufficient mergeEskil Abrahamsen Blomfeldt2010-09-241-2/+8
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-224-3/+17
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-09-221-0/+1
| |\ \ | | |/ | |/|
| | * remove extra includesRitt Konstantin2010-09-211-0/+1
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-09-222-1/+12
| |\ \
| | * | Fixed drawing a large number of glyphs with the same font under GL.Trond Kjernåsen2010-09-212-1/+12
| | |/
| * | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-09-211-3/+5
| |\ \ | | |/ | |/|
| | * Prevent crash in QGLGlyphCache due to dangling context references.Samuel Rødal2010-09-141-3/+5
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-218-19/+73
|\ \ \ | |/ /
| * | Fixed painter path drawing on FBO without stencil buffer.Kim Motoyoshi Kalland2010-09-202-0/+30
| * | Fixes QPen dash offset for OpenGL paint engines (1.x & 2.x).Yoann Lopes2010-09-202-0/+2
| * | Support multisampled pbuffers under Windows.Trond Kjernåsen2010-09-202-14/+28
| * | Prevented crash in GL window surface when deleting native child widgets.Samuel Rødal2010-09-101-4/+8
| * | Fixed compilation and API of meego graphics system.Samuel Rødal2010-09-101-0/+1
| * | Don't waste memory on the share widget in the GL window surface.Samuel Rødal2010-09-101-1/+4
* | | Fixes makeCurrent() failed messages on several systems.Trond Kjernåsen2010-09-161-3/+2
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-09-103-5/+12
|\ \ \
| * | | Support sub pixel positioning of glyphs in raster engineEskil Abrahamsen Blomfeldt2010-09-093-5/+12
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-107-15/+78
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Make sure we blit to the correct FBO in the GL window surface.Samuel Rødal2010-09-091-1/+5
| * | Some optimizations to the GL pixmap data.Samuel Rødal2010-09-094-6/+44
| * | 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
| * | Ensure that OpenGL contexts are attached to an NSView before first paintTor Arne Vestbø2010-09-021-3/+11
| * | Clear the QGLWindowSurface in ::beginPaint when needed.Michael Dominic K2010-08-311-0/+14
| * | Made QT_GL_SWAPBUFFER_PRESERVE=1 with the GL graphics system work.Samuel Rødal2010-08-311-5/+2