summaryrefslogtreecommitdiffstats
path: root/src/opengl
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtGunnar Sletta2010-09-2712-30/+110
|\
| * 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 'qt/master' into lighthouse-masterPaul Olav Tvete2010-09-1312-25/+191
|\ \ \ \ \ | |/ / / /
| * | | | 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
| * | | Doc update regarding threaded painting with QPainter in the QGL module.Trond Kjernåsen2010-09-093-9/+98
| * | | 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-304-4/+14
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-08-264-4/+14
| | |\ \ | | | |/
| | | * WGL_COLOR_BITS_ARB should not take the alpha bits into account.Trond Kjernåsen2010-08-251-1/+1
| | | * 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-133-3/+13
* | | | Compile fixPaul Olav Tvete2010-09-031-0/+3
* | | | Merge remote branch 'lighthouse/4.7' into lighthouse-masterPaul Olav Tvete2010-08-261-1/+1
|\ \ \ \
| * \ \ \ Merge branch 'qt-4.7' into lighthouse-4.7Paul Olav Tvete2010-08-268-24/+467
| |\ \ \ \ | | | |/ / | | |/| |
* | | | | Merge remote branch 'qt/master' into lighthouse-masterPaul Olav Tvete2010-08-269-27/+474
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration...Qt Continuous Integration System2010-08-258-30/+496
| |\ \ \ \
| | * \ \ \ Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-08-258-30/+496
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | 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-207-17/+440
| | | * | | Made GL pixmap backend respect Qt::NoOpaqueDetection flag..Samuel Rødal2010-08-191-2/+4
| * | | | | Call eglReleaseThread() when a thread exits, and fix warnings.Trond Kjernåsen2010-08-242-2/+6
| |/ / / /
* | | | | Merge remote branch 'lighthouse/4.7' into lighthouse-masterPaul Olav Tvete2010-08-193-6/+41
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge remote branch 'qt/4.7' into lighthouse-4.7Paul Olav Tvete2010-08-199-12/+65
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Prevented Xorg crash in qtdemo when running corkboards example.Samuel Rødal2010-08-172-5/+28