summaryrefslogtreecommitdiffstats
path: root/src/opengl
Commit message (Expand)AuthorAgeFilesLines
* Make sure the correct attribute arrays are enabled in GL's glyph cacheEskil Abrahamsen Blomfeldt2010-10-271-4/+4
* Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-265-60/+88
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-255-60/+88
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-235-60/+88
| | |\
| | | * Added support for blitting to native child widgets in GL window surface.Samuel Rødal2010-10-225-60/+88
* | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-252-2/+2
|\ \ \ \ | |/ / /
| * | | Fixed many spelling errors.Rohan McGovern2010-10-252-2/+2
| |/ /
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-2511-52/+52
|\ \ \ | |/ /
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-226-11/+11
| |\ \ | | |/ | |/|
| | * Functions that are externally defined to QtOpenGL needs to be imported.Jani Hautakangas2010-10-216-11/+11
| * | Major refactoring: creating a new QPixmapData subclass for live textures.Michael Dominic K2010-10-211-0/+1
| |/
| * Fix GL_OES_element_index_uint and add GL_OES_depth24 detection.Jani Hautakangas2010-10-206-41/+40
* | Don't redeclare voidPtr, it's already declared in CarbonCore's Thread.hTor Arne Vestbø2010-10-151-8/+8
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-123-13/+3
|\ \ | |/
| * Revert "Don't define highp/mediump/lowp if desktop GL has them"Trond Kjernåsen2010-10-123-13/+3
| * Fix text rendering in GL when using the broken-fbo-fallbackEskil Abrahamsen Blomfeldt2010-10-071-1/+1
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-075-140/+341
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-061-2/+3
| |\
| | * Adding a threshold for partial updates.Michael Dominic K2010-10-051-2/+3
| * | Quick fix for OSX and Windows/Mingw compilation errors.Jani Hautakangas2010-10-051-8/+8
| * | Fix gcc compilation problems in QtOpenGL. Actually was typo andJani Hautakangas2010-10-041-2/+2
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-044-134/+334
| |\ \ | | |/ | |/|
| | * Enable QtOpenGL vector path caching on Symbian/IVE3Jani Hautakangas2010-10-044-134/+334
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-015-20/+53
| |\ \ | | |/ | |/|
* | | Fix GL glyph cache with broken-fbo-fallbackEskil Abrahamsen Blomfeldt2010-10-061-1/+1
* | | 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