summaryrefslogtreecommitdiffstats
path: root/src/opengl
Commit message (Expand)AuthorAgeFilesLines
* Fix GLSL for OMAP3 and error checkingTom Cooksey2009-05-202-3/+3
* Fix GL2 paint engine builds on Big-endian machinesTom Cooksey2009-05-151-11/+8
* Make QtOpenGL compile on OpenGL ES 1.1 againTom Cooksey2009-05-148-45/+116
* Merge commit 'qt/master'Samuel Rødal2009-05-132-5/+3
|\
| * Merge branch '4.5'Thiago Macieira2009-05-071-2/+1
| |\
| | * Compiler warnings (Mac/Carbon)Bjoern Erik Nilsen2009-05-071-2/+1
| * | Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-05-061-3/+2
| |\ \ | | |/
| | * Re-enabled antialiasing for large font sizes in OpenGL paint engine.Samuel Rødal2009-05-061-3/+2
* | | Reverted use of GL 2 engine as default on desktop.Samuel Rødal2009-05-136-27/+15
* | | Made GL graphics system work with GLES2 w/o FramebufferBlit extension.Samuel Rødal2009-05-131-10/+11
* | | Enabled compilation of both GL and GL2 paint engine.Samuel Rødal2009-05-1313-124/+109
* | | Merge branch 'shader-api'Rhys Weatherley2009-05-101-1/+1
|\ \ \
| * | | Mac OSX compile errors in shader usageRhys Weatherley2009-05-101-1/+1
* | | | Merge branch 'gl2engine-new-shaders' into graphics-masterTom Cooksey2009-05-0612-406/+494
|\ \ \ \
| * | | | Big GL Extension CleanupTom Cooksey2009-05-068-252/+253
| * | | | Fix OpenGL ES 2.0 breakagesTom Cooksey2009-05-053-3/+14
| * | | | Rename uses of QGLShaderProgram::errors() to log()Rhys Weatherley2009-05-011-2/+2
| * | | | Merge branch 'shader-api' into gl2engine-new-shadersRhys Weatherley2009-05-017-149/+225
| |\ \ \ \ | | |/ / /
| | * | | qdoc fixesRhys Weatherley2009-05-011-12/+12
| | * | | Disable shaders on OpenGL/ES 1.1Rhys Weatherley2009-05-012-2/+2
| | * | | Samplers should be set via the GLuint override, not the GLint override.Rhys Weatherley2009-05-012-7/+35
| | * | | Make QGLShaderProgram::disable() static.Rhys Weatherley2009-05-012-2/+8
| | * | | Rename QGLShader(Program)::errors() to log()Rhys Weatherley2009-05-012-39/+39
| | * | | Add uniform setters for Qt data types to QGLShaderProgramTom Cooksey2009-05-012-0/+142
| | * | | Merge branch 'shaderprograms' of git@scm.dev.nokia.troll.no:qt/rweathers-shad...Rhys Weatherley2009-05-018-206/+3420
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Fix loading of partial shaders from files.Rhys Weatherley2009-03-271-3/+0
| | | * | Bug in QGLShaderProgram::addShader() that stopped partial shaders working.Rhys Weatherley2009-03-271-3/+6
| | | * | Import shader implementation from before the history cut.Rhys Weatherley2009-03-238-208/+3422
| | * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-291-2/+10
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Get rid of an unnecessary image copy when grabbing a GL framebuffer.Trond Kjernåsen2009-04-291-2/+10
| | * | | Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-04-271-0/+4
| | |\ \ \ | | | |/ /
| | | * | Fixes wrong QPaintEvent::region() in QGLWidget::paintEvent.Bjoern Erik Nilsen2009-04-271-0/+4
| | * | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-231-1/+1
| | |\ \ \ | | | |/ /
| | | * | Compile fix for static builds on Windows for QtOpenGL apps.Denis Dzyubenko2009-04-221-1/+1
| | * | | Merge branch '4.5'Rhys Weatherley2009-04-211-2/+8
| | |\ \ \ | | | |/ /
| | | * | Fix crash in OpenGL paint engine with hq antialiasing and TxProjectSamuel Rødal2009-04-211-2/+8
| | | * | Reparenting QGLWidgets did sometimes caused warnings to be printed onTrond Kjernåsen2009-04-151-1/+1
| | | * | BT: OpenGL ES 2.0 now compiles properly for Windows CEThomas Hartmann2009-04-151-4/+6
| | | * | BT: Fix Cocoa bug w/OpenGL widgets in dock widgets would disappear.Norwegian Rock Cat2009-04-153-23/+10
| | * | | Speed up texture uploads for hardware without n-pot-2 texture support.Trond Kjernåsen2009-04-201-53/+106
* | | | | compile...Gunnar Sletta2009-04-241-2/+1
* | | | | Remove old qglshader files from gl2paintengineex.Samuel Rødal2009-04-232-878/+0
|/ / / /
* | | | Allow release builds againTom Cooksey2009-04-221-2/+0
* | | | Make useCorrectShaderProg() return a bool againTom Cooksey2009-04-223-13/+10
* | | | Make optimiseForBrushTransform take a QTransform referenceTom Cooksey2009-04-222-2/+2
* | | | Change fragment shaders to apply the mask as the final stepTom Cooksey2009-04-221-2/+2
* | | | Merge branch 'master' into gl2engine-new-shadersSamuel Rødal2009-04-2216-243/+536
|\ \ \ \
| * | | | Prevent copy back from FBO when initializing render FBO from texture.Samuel Rødal2009-04-203-5/+5
| * | | | Smudgy text in GL2 paint engine when drawing on non-integer offsets.Samuel Rødal2009-04-171-21/+39
| * | | | Correctly handle using GL pixmaps that still have an active engine.Samuel Rødal2009-04-175-20/+86