summaryrefslogtreecommitdiffstats
path: root/src/opengl/gl2paintengineex/qglengineshadermanager.cpp
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-171-1/+1
|\
| * Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
* | Add inter-process binary shader cache for MeeGoHarald Fernengel2010-12-211-136/+158
* | Merge remote branch 'origin/4.7' into master-from-4.7Rohan McGovern2010-10-041-4/+13
|\ \ | |/
| * Only set maskTexture sampler uniform onceAaron Kennedy2010-09-281-4/+13
* | Clean up debug output.Trond Kjernåsen2010-07-021-4/+9
* | Rework the internal GL resource system yet again.Trond Kjernåsen2010-07-021-43/+6
* | Redesigned how GL resource management works.Trond Kjernåsen2010-07-021-50/+30
* | Don't use the QGLSignalProxy to clean up the thread-local shaders.Trond Kjernåsen2010-07-021-17/+32
* | Simplify how the QGLEngineSharedShaders object is cleaned up.Trond Kjernåsen2010-07-021-35/+32
* | More work on GL threading.Trond Kjernåsen2010-07-021-18/+76
|/
* Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Olivier Goffart2010-05-171-4/+6
|\
| * Workaround for ATI driver bug when using QGraphicsEffect with GL.Kim Motoyoshi Kalland2010-05-121-4/+6
* | Avoid using uncompatible vertex shader for non-solid brushesEskil Abrahamsen Blomfeldt2010-03-161-3/+10
* | Implement a special case, simplified vertex shader for complex geometryEskil Abrahamsen Blomfeldt2010-03-161-1/+6
|/
* Fix rendering with simple shader in GL2 engineTom Cooksey2010-01-221-0/+3
* Use an attribute value for the PMV matrix rather than a uniformTom Cooksey2010-01-211-1/+6
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-01-071-1/+1
|\
| * Update copyright year to 2010Jason McDonald2010-01-061-1/+1
* | Also delete blitShader & simpleShader in ~QGLEngineSharedShadersTom Cooksey2009-12-301-0/+10
* | fix a memory leak in QGLEngineSharedShadersjianliang792009-12-301-0/+7
* | Track which vertex attrib arrays are enabled in QGLContextPrivateTom Cooksey2009-12-301-1/+28
|/
* Remove pointless const's from functions (internal API)Tom Cooksey2009-12-291-2/+2
* Lots of mostly cosmetic cleanups to GL2 paint engineTom Cooksey2009-12-281-3/+3
* Handle broken shaders better in the GL2 engine's shader managerTom Cooksey2009-12-221-77/+114
* GL2Engine: Don't mark brush as dirty if it hasn't changedTom Cooksey2009-12-171-0/+1
* Modify QGLShader and QGLShaderProgram in response to API reviewRhys Weatherley2009-11-051-13/+13
* Fixed some compiler warnings.Samuel Rødal2009-11-031-7/+2
* Implement a simple caching algorithm for shader programs.Tom Cooksey2009-10-301-29/+42
* Rename qglEngineShaderSourceCode to qShaderSnippetsTom Cooksey2009-10-301-38/+48
* Refactor of shader manager to not use partial shadersTom Cooksey2009-10-301-180/+160
* Added some optimizations to the blur and drop shadow GL filters.Samuel Rødal2009-10-291-1/+1
* Consistently use QGLShareContextScope for context switchingRhys Weatherley2009-10-051-5/+1
* Added support for drawing a pixmap multiple times in one call.Kim Motoyoshi Kalland2009-10-021-22/+37
* Use QGLSharedResourceGuard to track contexts in the shader managerRhys Weatherley2009-10-011-4/+4
* Resubmit support for subpixel antialiasing on text in the GL2 engine.Kim Motoyoshi Kalland2009-09-221-3/+9
* Revert "Resubmit support for subpixel antialiasing on text in the GL2 engine."Rhys Weatherley2009-09-211-9/+3
* Resubmit support for subpixel antialiasing on text in the GL2 engine.Kim Motoyoshi Kalland2009-09-211-3/+9
* Revert "Added support for subpixel antialiasing on text in the GL2 engine."Rhys Weatherley2009-09-171-9/+3
* Added support for subpixel antialiasing on text in the GL2 engine.Kim Motoyoshi Kalland2009-09-161-3/+9
* Fixed glsl warnings on mac and stop using texturecoords when not neededGunnar Sletta2009-09-161-22/+20
* Silenced GLSL compiler warning on Mac OS XGunnar Sletta2009-09-151-1/+3
* Some small optimizations to gl2 engine.Gunnar Sletta2009-09-141-1/+3
* Update license headers again.Jason McDonald2009-09-091-4/+4
* Split QGLEngineShaderManager into a shared and a per engine part.Kim Motoyoshi Kalland2009-09-021-218/+229
* Don't seg-fault when printing error message in shader managerTom Cooksey2009-09-011-11/+25
* Update tech preview license header for files that are new in 4.6.Jason McDonald2009-08-311-13/+13
* Removed warnings / debug output in the GL 2 engine / pixmap filter code.Samuel Rødal2009-08-251-1/+1
* Merge commit 'qt/master' into kinetic-graphicseffectBjørn Erik Nilsen2009-08-171-1/+1
|\
| * Update contact URL in license headers.Jason McDonald2009-08-121-1/+1