Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Toggling QGraphicsEffect's enabled property does not update the source. | Bjørn Erik Nilsen | 2009-08-04 | 1 | -0/+6 |
| | | | | Makes tst_QGraphicsEffect::draw happy. | ||||
* | Add tests/auto/qgraphicseffect | Bjørn Erik Nilsen | 2009-08-04 | 3 | -0/+356 |
| | |||||
* | More QGraphicsEffect API cleanup. | Bjørn Erik Nilsen | 2009-08-04 | 3 | -30/+5 |
| | | | | Removing some left over from previous experiments. | ||||
* | Artifacts when moving a child when the parent has a graphics effect. | Bjørn Erik Nilsen | 2009-08-04 | 3 | -8/+113 |
| | | | | | | | | | | | We have to use the effectiveBoundingRect() when finding out which items to repaint within a specific area. However, we don't want items to be clickable on the shadow, so we shouldn't use effectiveBoundingRect for normal item-lookup. Solution to this is to only use effectiveBoundingRect() in the BSP (used by estimateTopLevels) and in drawSubtreeRecursive. Auto-test included. | ||||
* | Avoid painting on a null pixmap in QGraphicsShadowEffect. | Bjørn Erik Nilsen | 2009-08-03 | 1 | -0/+2 |
| | |||||
* | QGraphicsItem leave traces when removing graphics effect. | Bjørn Erik Nilsen | 2009-08-03 | 2 | -2/+2 |
| | | | | | | We have to update the view directly when removing an effect; otherwise we have no information about the effective bounding rect and only the item's bounding rect will be updated. | ||||
* | Infinite recursion in examples/graphicsview/customshader | Bjørn Erik Nilsen | 2009-07-31 | 1 | -1/+1 |
| | |||||
* | Fixes QGraphicsEffect offset bugs. | Bjørn Erik Nilsen | 2009-07-31 | 3 | -5/+6 |
| | |||||
* | Compile examples/graphicsview/customshader. | Bjørn Erik Nilsen | 2009-07-31 | 2 | -5/+5 |
| | |||||
* | Notify QGraphicsEffect about source bounding rect changes. | Bjørn Erik Nilsen | 2009-07-31 | 5 | -4/+15 |
| | |||||
* | Compile fix. | Bjørn Erik Nilsen | 2009-07-30 | 1 | -0/+1 |
| | |||||
* | Fix offset bug in QGraphicsShadowEffect. | Bjørn Erik Nilsen | 2009-07-30 | 1 | -4/+19 |
| | |||||
* | Make sure we don't create pixmaps that are bigger than the device rect. | Bjørn Erik Nilsen | 2009-07-30 | 5 | -2/+41 |
| | |||||
* | Prevent potential QGraphicsEffect crashes. | Bjørn Erik Nilsen | 2009-07-30 | 1 | -10/+17 |
| | |||||
* | Small optimization to QGraphicsEffectSource::boundingRect. | Bjørn Erik Nilsen | 2009-07-29 | 1 | -1/+2 |
| | | | | | Don't bother asking for the childrenBoundingRect if the item has no children. | ||||
* | A few QGraphicsEffect optimizations. | Bjørn Erik Nilsen | 2009-07-29 | 1 | -7/+20 |
| | | | | | | | First of all we shouldn't pass pixmap.rect() into the filter, we always want to draw the entire pixmap (without making a copy). We can also skip the filter entirely if the filter is effectively not doing anything. | ||||
* | QGraphicsShaderEffect doesn't need to be a metatype any more | Rhys Weatherley | 2009-07-29 | 1 | -2/+0 |
| | | | | Reviewed-by: trustme | ||||
* | Merge branch 'kinetic-graphicseffect' of ↵ | Bjørn Erik Nilsen | 2009-07-29 | 3 | -7/+7 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into graphicseffects | ||||
| * | Fixed various valgrind-reported issues in GL 2 engine. | Samuel Rødal | 2009-07-29 | 3 | -7/+7 |
| | | |||||
* | | Conflicts after merge commit 07c2b17276057a8b47c3be57ab7c2cf66dac0edd | Bjørn Erik Nilsen | 2009-07-29 | 3 | -23/+17 |
| | | | | | | | | Makes QGraphicsShaderEffect compatible with the new QGraphicsEffect API. | ||||
* | | Merge branch 'kinetic-graphicseffect' of ↵ | Bjørn Erik Nilsen | 2009-07-29 | 245 | -2336/+5476 |
|\ \ | |/ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into graphicseffects Conflicts: src/gui/graphicsview/qgraphicseffect.cpp src/gui/graphicsview/qgraphicseffect_p.h | ||||
| * | Improve GL filter performance by caching custom shader programs. | Samuel Rødal | 2009-07-28 | 2 | -10/+19 |
| | | | | | | | | This brings performance back up to where it was pre-merge. | ||||
| * | Merge commit 'qt-graphics-team/pixmapfilters-redux' into kinetic-graphicseffect | Samuel Rødal | 2009-07-28 | 13 | -337/+698 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/opengl/gl2paintengineex/qglengineshadermanager.cpp src/opengl/gl2paintengineex/qglengineshadermanager_p.h src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h Merge custom shader / GL blur pixmap filter implementation from graphics team repo with implementation from kinetic graphics-team repo. | ||||
| | * | Further optimized the GL blur filter by caching the QGLShader. | Samuel Rødal | 2009-07-02 | 2 | -4/+9 |
| | | | |||||
| | * | Fixed GL blur filter to handle painter translates and larger FBO sizes. | Samuel Rødal | 2009-07-02 | 1 | -1/+17 |
| | | | |||||
| | * | Made GL blur filter use the new FBO pool for improved performance. | Samuel Rødal | 2009-07-02 | 1 | -12/+16 |
| | | | |||||
| | * | Refactored the GL QPixmap backend to use an FBO pool class. | Samuel Rødal | 2009-07-02 | 2 | -41/+106 |
| | | | | | | | | | | | | | | | The FBO pool will be useful in other places as well, plus it makes it easier to deal with graphics memory management issues. | ||||
| | * | Added caching of custom shader programs as well in GL 2 shader manager. | Samuel Rødal | 2009-07-01 | 2 | -15/+32 |
| | | | | | | | | | | | | | | | Ensures that the programs are evicted from the cache when the shaders are destroyed. | ||||
| | * | Added QPixmapBlurFilter with GL implementation. | Samuel Rødal | 2009-06-30 | 3 | -1/+463 |
| | | | | | | | | | | | | | | | No raster engine based fallback so far... Also, performance is lacking since the QGLShaderProgram isn't cached. | ||||
| | * | Added missing createPixmapFilter() implementation in GL 2 engine. | Samuel Rødal | 2009-06-30 | 2 | -0/+10 |
| | | | |||||
| | * | Added drawTexture function to GL 2 paint engine. | Samuel Rødal | 2009-06-30 | 2 | -1/+17 |
| | | | | | | | | | | | | Works just like drawImage / drawPixmap but uses the given texture id. | ||||
| | * | Added custom shader hook to the GL 2 paint engine. | Samuel Rødal | 2009-06-30 | 5 | -24/+107 |
| | | | | | | | | | | | | | | | This will make it easier to implement pixmap filters, YUV->RGB conversions, etc in other parts of Qt. | ||||
| * | | Update QGraphicsShaderEffect to match new API | Rhys Weatherley | 2009-07-24 | 9 | -62/+61 |
| | | | |||||
| * | | Merge branch 'kinetic-graphicseffect' of ↵ | Rhys Weatherley | 2009-07-24 | 17 | -477/+488 |
| |\ \ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-graphicseffect | ||||
| * | | | Implement a variant on blurpicker that shows a custom shader. | Rhys Weatherley | 2009-07-24 | 10 | -0/+569 |
| | | | | |||||
| * | | | Reset shader stage variables when the custom shader is explicitly removed. | Rhys Weatherley | 2009-07-24 | 1 | -0/+2 |
| | | | | |||||
| * | | | Implement QGraphicsShaderEffect for custom shader-based effects | Rhys Weatherley | 2009-07-24 | 3 | -0/+413 |
| | | | | |||||
| * | | | Make it easier to change custom shaders. | Rhys Weatherley | 2009-07-24 | 4 | -0/+26 |
| | | | | |||||
| * | | | Make ordinary shaders work again after custom shader changes. | Rhys Weatherley | 2009-07-24 | 1 | -7/+7 |
| | | | | |||||
| * | | | Merge branch 'custom_shaders' of ../qt-graphics-team into custom-shaders | Rhys Weatherley | 2009-07-23 | 228 | -2006/+3769 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem_p.h | ||||
| | * | | | Actually add the files... :-) | Tom Cooksey | 2009-07-23 | 2 | -0/+196 |
| | | | | | |||||
| | * | | | Initial stab at a custom shader stage API | Tom Cooksey | 2009-07-23 | 6 | -56/+134 |
| | | | | | |||||
| | * | | | Fix build on Harmattan | Tom Cooksey | 2009-07-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Reviewed-By: Trustme | ||||
| | * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Martin Jones | 2009-07-23 | 7 | -50/+282 |
| | |\ \ \ | |||||
| | | * | | | Fix merge error, restore size of bit field. | Andreas Aardal Hanssen | 2009-07-23 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change 34fde4a4 removes one bit from the flags bitfield, which was added in change 7bc98d7b. This happened during resolving of a merge conflict and caused some input method related autotests in tst_QGraphicsView to fail. Reviewed-by: mbm | ||||
| | | * | | | Add QGraphicsItem::focusProxy(), focus proxy support. | Andreas Aardal Hanssen | 2009-07-23 | 6 | -48/+261 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Following QWidget's behavior, you can not assign any item in the same scene as a focus proxy for another item. Also supports nested focus proxies. You can only assign items in the same scene as focus proxies. Autotests are included. Reviewed-By: mbm | ||||
| | | * | | | Add texture_from_pixmap defines for systems without them | Tom Cooksey | 2009-07-23 | 1 | -0/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the build on older Solaris machines which don't have the GLX_EXT_texture_from_pixmap defines in glxext.h. Reviewed-By: Trustme | ||||
| | * | | | | Build with rvct compiler. | Martin Jones | 2009-07-23 | 2 | -2/+3 |
| | |/ / / | | | | | | | | | | | | | | | | Reviewed-by: akennedy | ||||
| | * | | | Add the math3d types to QVariant | Rhys Weatherley | 2009-07-23 | 15 | -28/+452 |
| | | | | | | | | | | | | | | | | | | | | Reviewed-by: Sarah Smith | ||||
| | * | | | Compile in release mode for DFB version > 0.9 | Anders Bakken | 2009-07-22 | 1 | -1/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Something went wrong with the integrate from 4.5 to master. Reviewed-by: TrustMe |