summaryrefslogtreecommitdiffstats
path: root/src/opengl
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Jason McDonald2009-08-311-0/+38
|\
| * Fixed compile failure caused by merge error in fragmentprograms_p.h.Samuel Rødal2009-08-311-0/+38
* | Update tech preview license header for files that are new in 4.6.Jason McDonald2009-08-318-104/+104
|/
* Fixed inverted pixmaps when using OpenGL graphics effects.Samuel Rødal2009-08-311-1/+3
* Merge branch '4.5' into 4.6Thiago Macieira2009-08-3150-637/+650
|\
| * Update tech preview license header.Jason McDonald2009-08-3159-767/+767
| * Update license headers.Jason McDonald2009-08-1159-59/+59
* | Move QGLShareContextScope to qgl_p.h so other things can use it.Rhys Weatherley2009-08-312-37/+40
* | Remove QGLShader from its QGLShaderProgram when it is destroyedRhys Weatherley2009-08-312-4/+23
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-08-284-29/+130
|\ \
| * | Fixed QGLWidget::renderText() when using the GL 2 paint engine.Trond Kjernåsen2009-08-284-23/+108
| * | Fixed a problem where the InvertedYBindOption was always removed.Trond Kjernåsen2009-08-281-1/+1
| * | Added some information to QGLFramebufferObject documentationSamuel Rødal2009-08-281-4/+4
| * | doc: Fixed several qdoc errors.Martin Smith2009-08-281-2/+18
* | | Attempting to make EGL compile again and fix some potentialGunnar Sletta2009-08-285-17/+35
|/ /
* | Define highp to mediump on OpenGL/ES systems that don't have highpRhys Weatherley2009-08-271-0/+15
* | Remove extraneous semi-colonsRhys Weatherley2009-08-272-3/+3
* | Fixed path filling in the GL2 paint engine.Kim Motoyoshi Kalland2009-08-271-1/+1
* | Fix y orientation of pixmap brushes and pixmaptiles in gl1 engineGunnar Sletta2009-08-274-3525/+3370
* | Don't flip texture coords in texture brushes in accordance with new bindTextureGunnar Sletta2009-08-271-1/+0
* | compile on x11Gunnar Sletta2009-08-271-1/+1
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-08-279-115/+108
|\ \
| * | Make QGLShader::ShaderType slightly more future proof byGunnar Sletta2009-08-272-8/+18
| * | API improvements for creating shaders from filesRhys Weatherley2009-08-272-52/+28
| * | Made GL 2 engine reset various GL state to their defaults in end().Samuel Rødal2009-08-262-3/+10
| * | Made brush textures in GL2 engine use correct filtering.Samuel Rødal2009-08-261-8/+10
| * | Improved GLSL precision specifiers in GL 2 engine.Samuel Rødal2009-08-261-24/+24
| * | Improved QPainter API for allowing native painting in GL / VG.Samuel Rødal2009-08-263-3/+10
| * | Remove Graphics View dependency from QGraphicsShaderEffect.Bjørn Erik Nilsen2009-08-262-8/+0
| * | doc: fixes qdoc warnings/errors related to the Graphics Effect framework.Bjørn Erik Nilsen2009-08-261-1/+1
| * | Added missing precision specifiers to custom shader effect.Samuel Rødal2009-08-264-8/+8
* | | make x11 compile...Gunnar Sletta2009-08-271-3/+3
* | | New variant of QGLContext::bindTexture that does not require mipmap generationGunnar Sletta2009-08-279-89/+308
|/ /
* | Fixed clipping bug in GL 2 paint engine (visible in arthur demos).Samuel Rødal2009-08-261-1/+1
* | Fixed documentation and use of incorrect entry point for custom shaders.Samuel Rødal2009-08-252-12/+9
* | Removed warnings / debug output in the GL 2 engine / pixmap filter code.Samuel Rødal2009-08-253-4/+1
* | Fix obsolete license headers.Jason McDonald2009-08-212-6/+6
* | Fix obsolete license headers.Jason McDonald2009-08-212-5/+5
* | compile fix with namespaces in QGLCustomShaderStagePrivatehjk2009-08-211-0/+4
* | Fix drawTiledPixmap for texture_from_pixmap on X11/EGLTom Cooksey2009-08-212-0/+5
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into master-s60axis2009-08-2113-115/+1211
|\ \
| * \ Merge commit 'qt/master' into kinetic-graphicseffectBjørn Erik Nilsen2009-08-213-43/+10
| |\ \
| * | | Add "QObject *parent = 0" to QGraphicsShaderEffect constructor.Bjørn Erik Nilsen2009-08-202-3/+3
| * | | Merge commit 'qt/master' into kinetic-graphicseffectBjørn Erik Nilsen2009-08-197-23/+42
| |\ \ \
| * \ \ \ Merge commit 'qt/master' into kinetic-graphicseffectBjørn Erik Nilsen2009-08-1755-61/+81
| |\ \ \ \
| * \ \ \ \ Merge commit 'qt/master' into kinetic-graphicseffectBjørn Erik Nilsen2009-08-0710-115/+473
| |\ \ \ \ \
| * | | | | | QGraphicsShaderEffect doesn't need to be a metatype any moreRhys Weatherley2009-07-291-2/+0
| * | | | | | Merge branch 'kinetic-graphicseffect' of git@scm.dev.nokia.troll.no:qt/kineti...Bjørn Erik Nilsen2009-07-293-7/+7
| |\ \ \ \ \ \
| | * | | | | | Fixed various valgrind-reported issues in GL 2 engine.Samuel Rødal2009-07-293-7/+7
| * | | | | | | Conflicts after merge commit 07c2b17276057a8b47c3be57ab7c2cf66dac0eddBjørn Erik Nilsen2009-07-292-22/+16
| |/ / / / / /