summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Optimize intersected rect clipping in raster engine..Gunnar Sletta2009-04-241-2/+21
| | | | | | | | If we have span based clipping (complex) and we manage to intersect down to a plain rectangle, we switch back to rectangle mode which speeds up filling significantly... Reviewed-by: Samuel
* Implement QRasterPaintEngine::clip(QRegion) to do something sensible...Gunnar Sletta2009-04-242-61/+86
| | | | | | | | | | | Since we now store QRegion's in the clipdata is possible for us to detect that we should go back to a rect-clip mode when we get to clip(region) or clip(rect) It turns out that the qt_span_fill_clipRegion is very slow, even for smaller regions, testcase was 3 rects, its 10% worse than span based clipping. For a fullscreen ellipse it was more in the range of 100x worse, so I removed the clip function entirely.
* Remove old qglshader files from gl2paintengineex.Samuel Rødal2009-04-232-878/+0
|
* Allow release builds againTom Cooksey2009-04-221-2/+0
| | | | The list of shaders shouldn't change too much now.
* Make useCorrectShaderProg() return a bool againTom Cooksey2009-04-223-13/+10
| | | | | Returns true if it had to change the shader program so the engine knows it needs to clean the uniforms.
* 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
| | | | I.e. After composition, not before.
* Merge branch 'master' into gl2engine-new-shadersSamuel Rødal2009-04-22302-7335/+9584
|\ | | | | | | | | | | Conflicts: src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/opengl.pro
| * 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
| | | | | | | | | | | | | | | | | | Special-case TextDrawingMode in updateMatrix() as we know that we'll have a pure translating transform, and round the transform's dx and dy to avoid drawing on non-integer offsets. Task-number: 245806 Reviewed-by: Tom
| * Correctly handle using GL pixmaps that still have an active engine.Samuel Rødal2009-04-175-20/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the case where a GL pixmap is used when there it still has an active engine we need to ensure that the pixmap has been flushed from the render FBO first. The newly added QGLPixmapData::copyBackFromRenderFbo() handles this. In addition, because several GL 2 paint engines can be active on the same context at the same time, we can't make any assumptions and need to call the newly added QGL2PaintEngineEx::ensureCreated() in the beginning of any state-dependent paint engine function. QGL2PaintEngineEx::ensureCreated() correctly transfers control to the current engine if a different engine is active. Running lance with -pixmap and -graphicssystem opengl works correctly with the GL pixmap backend now.
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-graphics-teamGunnar Sletta2009-04-179-151/+363
| |\
| | * Use FBOs as pixmap backend in GL graphics system.Samuel Rødal2009-04-168-98/+311
| | | | | | | | | | | | | | | | | | | | | | | | We now use FBOs to implement render-to-pixmap for the GL pixmap backend. A multisample FBO is used for rendering, and is then blitted onto a non-multisample FBO dynamically bound to the relevant texture. Reviewed-by: Tom
| | * Make FBO the default instead of pixel buffers in GL window surface.Samuel Rødal2009-04-161-28/+29
| | | | | | | | | | | | Fall back to using pbuffers only if the FBO fails.
| | * Ensure we don't access the GL share widget when it's being destroyed.Samuel Rødal2009-04-161-2/+3
| | | | | | | | | | | | | | | Zero the pointer before destroying the widget, as QGLWidget's destructor may indirectly trigger access to the share widget.
| | * GL2: Avoid expensive updateDepthClip() every time setState() is calledSamuel Rødal2009-04-162-17/+14
| | | | | | | | | | | | Only call updateDepthClip() if the clip has actually changed.
| | * Fix off-by-one bugs in the framebuffer blits.Samuel Rødal2009-04-161-6/+6
| | | | | | | | | | | | The bottom-right coordinates are exclusive, not inclusive.
| * | Merge branch 'qt/main'Gunnar Sletta2009-04-17297-7155/+9109
| |\ \ | | |/ | |/| | | | | | | Conflicts: src/opengl/opengl.pro
| | * QTreeView automatic resize can be brokenThierry Bastian2009-04-163-20/+37
| | | | | | | | | | | | | | | | | | | | | QTreeView sometimes autoresizes the wrong column Task-number: 210390 Reviewed-by: janarve
| | * Make subpixel antialiasing of text work on Mac OS X under carbonGunnar Sletta2009-04-164-41/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement the alphaRGBMapForGlyph function and make use of it in the raster engine. The gamma correction is currently hardcoded to 2.0 which looks very good on two separate displays (iMac and MacBook Pro). Ideally this would be picked from the system settings or computed dynamically, but as long as 2.0 works, we'll stick to that. Reviewed-by: Samuel
| | * Fixes: Faster string-splitting in QResource::findNode()Gunnar Sletta2009-04-161-7/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Samuel Details: Creating the intermediate stringlist and appending all the temporary strings to it costs quite a bit. Fix this by introducing a StringSpliter class that is malloc-free and uses QStringRef instead. Found during S60 Performance week
| | * Fixes: Make QDir::cleanPath() slightly faster, by avoiding some detach calls..Gunnar Sletta2009-04-161-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | RevBy: Samuel Details: We have the size of the array and we don't realloc, so we can use direct pointer access. This saves us a few detach() calls and some refcount checking in the inner loops... Found during S60 Performance week...
| | * Fixes: Speed up QFileInfo::setFile() a bit...Gunnar Sletta2009-04-161-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | RevBy: Samuel Details: When doing initFileEngine on a operational QFileInfo, it will detach(), which creates copy of the file engine, then we delete this engine and create our own engine. Creating a clean QFileInfo, saves us one temporary file engine..
| | * Experimental fix for speeding up QResource::name()...Gunnar Sletta2009-04-161-2/+8
| | |
| | * Reduce the number of calls to cleanPath() in QResourceRoot::findNodeSamuel Rødal2009-04-161-8/+16
| | | | | | | | | | | | | | | | | | | | | Move the cleanPath call out of the function and outside the loops to avoid doing the same work over and over. Reviewed-by: Gunnar Sletta
| | * Optimize vector normalize for vectors of length 1Rhys Weatherley2009-04-155-39/+63
| | | | | | | | | | | | | | | | | | If the square of the length is very close to 1, then avoid the qSqrt(). Reviewed-by: trustme
| | * Add the QQuaternion::nlerp() function as a counterpart to slerp()Rhys Weatherley2009-04-153-0/+98
| | | | | | | | | | | | | | | | | | | | | | | | nlerp() implements "normalized linear interpolation", which is faster than slerp() and gives approximate results that are good enough for some applications. Reviewed-by: trustme
| | * Rename QQuaternion::interpolate() to slerp()Rhys Weatherley2009-04-153-7/+7
| | | | | | | | | | | | | | | | | | slerp() is the more common-place name in the 3D community. Reviewed-by: trustme
| | * Remove the int constructors from the vector classesRhys Weatherley2009-04-158-37/+0
| | | | | | | | | | | | | | | | | | | | | | | | The int constructors existed to make fixed-point conversions faster in certain circumstances. With the removal of fixed-point support, they are no longer required. Reviewed-by: trustme
| | * Merge branch '4.5' of git@scm.dev.troll.no:qt/qtSimon Hausmann2009-04-152-9/+26
| | |\
| | | * protect against circular inclusion of pro/pri filesOswald Buddenhagen2009-04-151-1/+7
| | | | | | | | | | | | | | | | Task-number: 250574
| | | * do not crash on lines starting with an equal signOswald Buddenhagen2009-04-151-0/+3
| | | |
| | | * fix uninitialized variable readOswald Buddenhagen2009-04-151-4/+12
| | | |
| | | * add some commentsOswald Buddenhagen2009-04-151-4/+4
| | | |
| | | * Changelog for 4.5.1Denis Dzyubenko2009-04-151-0/+42
| | | |
| | | * GTK: Fix line edit background color with custom brushJens Bache-Wiig2009-04-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We should allways use the brush and not the color if possible. Task-number: 240842 Reviewed-by: nrc
| | | * Silence warning about unused static function on WindowsJoão Abecasis2009-04-151-0/+2
| | | | | | | | | | | | | | | | Reviewed-by: mariusSO
| | | * QFileDialog : Fix filters that doesn't work if whitespaces at the endAlexis Menard2009-04-152-6/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix is basically remove the whitespaces at the end otherwise the reg exp will be wrong. Task-number: 240789 Reviewed-by: jasplin
| | | * Fixed and improved the example codeJan-Arve Sæther2009-04-152-14/+58
| | | |
| | | * Updated changesPaul Olav Tvete2009-04-151-0/+3
| | | |
| | | * Make choosing a file path for a QUrl-type property work on Windows.Friedemann Kleint2009-04-151-1/+1
| | | | | | | | | | | | | | | | | | | | Use QUrl::fromLocalFile to construct the url string. Reviewed-by: Jarek Kobus <jkobus@trolltech.com>
| | | * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Jarek Kobus2009-04-1543-858/+2198
| | | |\
| | | | * Update changelog with my changesBradley T. Hughes2009-04-151-0/+26
| | | | |
| | | | * Fixed painting issues with draggable tabsJens Bache-Wiig2009-04-153-75/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a few of the remaining glitches tabbar animations have: * We no longer grab tabs but paint them through QStyle. This makes tabs work and animate correctly when they are outside the visible region. * Buttons now correctly follow tabs when dropped * Gtkstyle recieved some polish to make it look more native. Task-number: 247694, 251166 Reviewed-by: nrc
| | | | * Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Kavindra Devi Palaraja2009-04-152-2/+9
| | | | |\
| | | | | * Prevent crash in qt_scrollRectInImage.Samuel Rødal2009-04-152-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clip both against the source and target device rectangles. Task-number: 247937 Reviewed-by: Trond BT: yes
| | | | * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5Kavindra Devi Palaraja2009-04-158-15/+96
| | | | |\ \ | | | | | |/ | | | | | | | | | | | | Merge commit '4e9c2364e8e9580aa317e9387338d45207ac4baa' into HEAD
| | | | | * My 4.5.1 changes.Morten Sørvig2009-04-151-2/+16
| | | | | |
| | | | | * Update the item if the text has changed but the boundingRect is theAlexis Menard2009-04-152-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | same. updateBoudingRect update the item only if the boundingRect change but if we have 123 as an initial text and then we set 321 as the new text, then nothing happen because the rect is the same. In case the boundingRect change then we call update 2 times but the item is already dirty so the second call will just return. BT:yes Reviewed-by: Andreas
| | | | | * BT: Updated configure for OpenGL ES 2.0 Windows CEFriedemann Kleint2009-04-151-0/+0
| | | | | |
generated by cgit v0.12 at 2025-08-26 00:10:48 (GMT)