summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Make fillRect() with a QBrush(Qt::NoBrush) a noopTom Cooksey2009-04-161-0/+3
* Don't seg-fault when the shader prog is in the cacheTom Cooksey2009-04-161-1/+2
* Merge branch 'new-shader-api' into gl2engine-new-shadersTom Cooksey2009-04-162-0/+142
|\
| * Add uniform setters for Qt data types to QGLShaderProgramTom Cooksey2009-04-162-0/+142
* | Clean up existing & implement missing GLSL for new shader managerTom Cooksey2009-04-164-154/+320
* | Adapt GL2 Paint Engine to new math3d, shader & shader manager APIsTom Cooksey2009-04-161-43/+43
* | Re-write the shader manager & completely break everything ;-)Tom Cooksey2009-04-167-750/+758
* | Add (big) comment explaining shader pipeline in GL2 engineTom Cooksey2009-04-031-0/+138
|/
* Fix build breakage after rebasing on graphics-mainTom Cooksey2009-04-032-8/+1
* Fix loading of partial shaders from files.Rhys Weatherley2009-04-031-3/+0
* Bug in QGLShaderProgram::addShader() that stopped partial shaders working.Rhys Weatherley2009-04-031-3/+6
* Import shader implementation from before the history cut.Rhys Weatherley2009-04-0317-1070/+3619
* Merge branch 'graphics-main'Gunnar Sletta2009-04-0324-401/+1191
|\
| * Fixes: make the toNormalizedFillRect function slightly fasterGunnar Sletta2009-04-011-5/+10
| * Fixes: Use the blit/multisample FBO API in the framebuffer object example.Samuel Rødal2009-04-012-5/+26
| * Fixes: Prevent QGLFramebufferObject from resetting the current context.Samuel Rødal2009-04-011-2/+4
| * Fixes: Use the new framebuffer blit/multisample API in the window surface.Samuel Rødal2009-04-011-18/+31
| * Fixes: Add blitting and multisample API to QGLFramebufferObject.Samuel Rødal2009-04-016-30/+520
| * Fixes: Make FBO window surface work with GL 2 paint engine.Samuel Rødal2009-04-012-0/+7
| * Fixes: Respect the SmoothPixmapTransform render hint in the GL2 paint engine.Samuel Rødal2009-04-011-1/+1
| * Fixes: Get rid of GL 2 paint engine debug message...Samuel Rødal2009-04-011-2/+0
| * Fixes: Small optimizations in GL 2 paint engine...Samuel Rødal2009-04-011-3/+3
| * Fixes: Clipping bug in GL 2 paint engine (embeddeddialogs demo).Samuel Rødal2009-04-011-0/+1
| * Fixes: Extreme amount of pixel buffers created in embeddeddialogs demo.Samuel Rødal2009-04-012-3/+12
| * Fixes: Make raster engine perform better on 0-opacity drawingGunnar Sletta2009-04-012-7/+19
| * Fixes: Introduce mode transfer functions in the GL 2 paint engine.Samuel Rødal2009-04-012-53/+94
| * Fixes: Enable use of the GL pixmap backend in the GL 2 paint engine.Samuel Rødal2009-04-014-8/+20
| * Fixes: GL 2 paint engine text rendering optimization.Samuel Rødal2009-04-014-57/+52
| * Fixes: Improve text rendering in GL 2 paint engine.Samuel Rødal2009-04-011-2/+2
| * Get rid of warning introduced in the last commit.Samuel Rødal2009-04-011-1/+1
| * Fixes: Move QGLDrawable into qgl_p.h so that we can use it in the GL 2 pai...Samuel Rødal2009-04-014-185/+193
| * Merge branch 'gl2text' of ..\qt-mainKim Motoyoshi Kalland2009-04-0111-31/+207
* | Merge branch '4.5'Rhys Weatherley2009-04-032-1/+4
|\ \
| * | Suppress unnecessary "Could not re-create the temporary EGL surface" warningsRhys Weatherley2009-04-031-1/+1
| * | Add information about QT_* defines that are needed to make PowerVR workRhys Weatherley2009-04-031-0/+3
* | | Build breakage: QStringList declaration missing in qkbd_qws.cppRhys Weatherley2009-04-021-0/+1
* | | Make QWS a bit more OS independent.Robert Griebl2009-04-028-23/+29
* | | Keymap support for QWS.Robert Griebl2009-04-0227-1020/+2780
* | | Merge commit 'origin/4.5'Oswald Buddenhagen2009-04-027-4/+85
|\ \ \ | |/ /
| * | some more quoting for qmake ...Oswald Buddenhagen2009-04-022-2/+2
| * | Adding auto-tests for commits a2fcc4a5 and 8d500381João Abecasis2009-04-024-1/+78
| * | Only set system style when it actually changesJens Bache-Wiig2009-04-021-1/+5
* | | amend 3570e978058816745101a69b552ad9d07e349542 for masterOswald Buddenhagen2009-04-021-5/+6
* | | don't lose codecForTr in c++ parserOswald Buddenhagen2009-04-021-1/+3
* | | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtSimon Hausmann2009-04-0247-597/+439
|\ \ \ | |/ /
| * | Make mkdist-webkit work from in-source buildsSimon Hausmann2009-04-021-1/+1
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5kh2009-04-024-12/+19
| |\ \
| | * | make relative #include relative to the current fileOswald Buddenhagen2009-04-021-1/+1
| | * | re-apply improved version of 3aff9113a9702ea6f7e099a73136a718ae1b992fOswald Buddenhagen2009-04-022-2/+8
| | * | re-initialize some variables for each fileOswald Buddenhagen2009-04-021-5/+4