aboutsummaryrefslogtreecommitdiffstats
path: root/src/declarative/scenegraph
Commit message (Collapse)AuthorAgeFilesLines
* Make QSGTextNode back-end for QML's TextInput and TextEditEskil Abrahamsen Blomfeldt2011-08-192-4/+6
| | | | | | | | | | | | | | | | Use the general QSGTextNode class as back-end for all text elements in QML to make all text elements look the same and use the same text rasterization back-end. This requires a few rewrites in the text node to support e.g. selections. Crashes seen with threaded renderer in TextEdit and TextInput on Mac are also fixed by this. Reviewed-by: Jiang Jiang Task-number: QTBUG-18019, QTBUG-20017 Change-Id: I4207faf180c83422e5f8b726741321af395bd724 Reviewed-on: http://codereview.qt.nokia.com/2865 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Don't skip autotest and export needed symbolGunnar Sletta2011-08-191-1/+1
| | | | | | | Change-Id: Ib5090348cefa955caa54c5e4fff8cb961ddb8e52 Reviewed-on: http://codereview.qt.nokia.com/3147 Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Use scissor clip if element is rotated a multiple of 90 degrees.Kim Motoyoshi Kalland2011-08-171-9/+23
| | | | | | | Change-Id: I16706049f0ff5a371b5fa95430ca6c2d2f1add96 Reviewed-on: http://codereview.qt.nokia.com/3086 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Fixed mirrored distance-field text.Kim Motoyoshi Kalland2011-08-171-1/+1
| | | | | | | Change-Id: Ib80f30afc72b6ef6a9cabb604656755e0b4dfff1 Reviewed-on: http://codereview.qt.nokia.com/3089 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com>
* Implemented minimum FBO size on the ShaderEffectSource.Kim Motoyoshi Kalland2011-08-172-0/+16
| | | | | | | | | Task-number: QTBUG-20193 Change-Id: I45020c094c4a4892c055700f084fde7b219cdc10 Reviewed-on: http://codereview.qt.nokia.com/2972 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Fixed clipping on perspective transformed QML2 elements.Kim Motoyoshi Kalland2011-08-161-2/+2
| | | | | | | | | Task-number: QTBUG-19901 Change-Id: I1f6bd31f4afec3d9b199086a01ffe5e714a20efa Reviewed-on: http://codereview.qt.nokia.com/2915 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Fixed QSGNode leak.Kim Motoyoshi Kalland2011-08-121-1/+1
| | | | | | | | | QSGItem was setting its node pointer to 0 without deleting it. Change-Id: I8b52d02069410b1dfc0057f926a52c946ef348a2 Reviewed-on: http://codereview.qt.nokia.com/2910 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Compile.Bjørn Erik Nilsen2011-08-111-1/+1
| | | | | | | Change-Id: I13f95b415b28467617c4ca804e706082150d253e Reviewed-on: http://codereview.qt.nokia.com/2870 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Bjørn Erik Nilsen <bjorn.nilsen@nokia.com>
* Added a faster subpixel antialiasing material for distance field text.Yoann Lopes2011-08-116-18/+98
| | | | | | | | | | Based on two texture samples instead of five. Can be enabled with qmlscene --text-subpixel-antialiasing-lowq Change-Id: I726f73d812b93aa9ca38ce142d1e97b9a40d200a Reviewed-on: http://codereview.qt.nokia.com/2861 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com>
* Remove initialization warningsGunnar Sletta2011-08-111-6/+6
| | | | | | | Change-Id: Ie11a91034174b248b564fa5d8af8905a79b6eacf Reviewed-on: http://codereview.qt.nokia.com/2841 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
* QSGDistanceFieldGlyphCache code refactoring.Yoann Lopes2011-08-109-151/+204
| | | | | | | | The distance field glyph caches are now contained in the QSGContext. Change-Id: Ifc5d155917314b1cc5905ef86fdad0bbc5635c7d Reviewed-on: http://codereview.qt.nokia.com/2787 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Make distance field text more easily configurable.Yoann Lopes2011-08-093-19/+39
| | | | | | | | | | Custom functions can be provided to compute the distance field threshold value and antialiasing range. Change-Id: Ie2ec8160d81671dedf72f0c72c3a5cbdf04d993a Reviewed-on: http://codereview.qt.nokia.com/2772 Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* define for timingGunnar Sletta2011-08-011-0/+13
| | | | | | | Change-Id: Id91e47be0c2706de7871f3492725c577063ae5fb Reviewed-on: http://codereview.qt.nokia.com/2438 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Renamed ShaderEffectItem to ShaderEffect and some API changes.Kim Motoyoshi Kalland2011-07-281-1/+1
| | | | | | | | | | | | | | | | The ShaderEffectItem was renamed to ShaderEffect to be consistent with other QML element names. The GLSL uniform variable qt_ModelViewProjectionMatrix was renamed to qt_Matrix which is easier to type and remember. The GridMesh element was removed. The mesh resolution is now specified simply with a QSize. To make the transition easier, the old API will continue to work for some time, but will output warnings if used. Eventually, I will remove the old API completely. Change-Id: Iec4f2aa624a2c76a7db6750c58f73dbcb316ab6a Reviewed-on: http://codereview.qt.nokia.com/2270 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Renamed the Bindable class to QSGBindable.Kim Motoyoshi Kalland2011-07-203-15/+15
| | | | | | | Change-Id: Id00868bd0ea93010912f06fba67624fb325ecc41 Reviewed-on: http://codereview.qt.nokia.com/1818 Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Improved the performance of distance-field generation.Kim Motoyoshi Kalland2011-07-204-334/+2327
| | | | | | | Change-Id: Ie17650196c7e4531cbc6f760905e41d95808efcd Reviewed-on: http://codereview.qt.nokia.com/1675 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Fixed QSGDistanceFieldGlyphNode initialization order.Yoann Lopes2011-07-204-8/+36
| | | | | | | Change-Id: Id2e8ccf6441ce7e7a2bcdd6f0d50745e7d9ba653 Reviewed-on: http://codereview.qt.nokia.com/1750 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com>
* Update licenseheader text in source files for qtdeclarative Qt moduleJyri Tahtela2011-07-0857-971/+971
| | | | | | | | Replace old license header with correct one. Change-Id: I492ddaaa0227b2c8faf11bdcd6e12e7231a54a10 Reviewed-on: http://codereview.qt.nokia.com/1312 Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* Fix compilationOlivier Goffart2011-07-011-4/+4
| | | | | | | | | qsgdefaultrectanglenode.cpp:221:22: error: narrowing conversion of '(((& c)->QColor::redF() * (&c)->QColor::alphaF()) * 2.55e+2)' from 'qreal {aka double}' to 'unsigned char' inside { } [-fpermissive] Change-Id: I4f051f07d5db28fd03739343c255cc72d968a99d Reviewed-on: http://codereview.qt.nokia.com/1004 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
* Support setting an FBO as the render target for a canvasGunnar Sletta2011-07-012-3/+10
| | | | | | | Change-Id: I8049580f1d2b27d6ebc4d595712939338c01b711 Reviewed-on: http://codereview.qt.nokia.com/986 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Document threading issues with QSGEngine signalsGunnar Sletta2011-06-301-0/+7
| | | | | | | Change-Id: I769c0793929c4c90464f6e9fea46bd1a19fbacf3 Reviewed-on: http://codereview.qt.nokia.com/939 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Updated tst_nodestest to use the DirtyForceUpdate flag.Kim Motoyoshi Kalland2011-06-232-4/+2
| | | | | | Changed test to use DirtyForceUpdate instead of DirtyAll, and removed DirtyRenderOrder and DirtyAll enums which should not be used.
* Merge multiple lines of text into a single geometry nodeGunnar Sletta2011-06-231-8/+50
| | | | | | | | | Long term, we might want to have this kind of logic in the QSGGeometry class through a grow() function or in the QSGRenderer, but we only have this one usecase where it actually makes sense right now, so I'm keeping it local. Change-Id: Ibbb0dd4a6e4b587154e26ffc2a34375fbb4a571d
* Start out with a distance field cache that fits more charactersGunnar Sletta2011-06-201-2/+3
|
* Compile fix for MSVC.Kim Motoyoshi Kalland2011-06-201-1/+1
|
* Removed unnecessary calls to QSGNode::destroy().Kim Motoyoshi Kalland2011-06-203-14/+23
|
* Merge branch 'master' into qtquick2Gunnar Sletta2011-06-201-1/+36
|\
| * Implement caching of the distance fields...Gunnar Sletta2011-06-201-1/+36
| | | | | | | | Change-Id: I823341b9b53e885dcd004e17e319cf033dc21c45
* | Merge branch 'master' into qtquick2Gunnar Sletta2011-06-1516-753/+335
|\| | | | | | | | | | | | | | | | | Conflicts: src/declarative/scenegraph/coreapi/qsgdefaultrenderer.cpp src/declarative/scenegraph/coreapi/qsgdefaultrenderer_p.h tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp Change-Id: Id2267925c4f77b41f63bbbf555b816ca1f55a0ec
| * Speed up distance field generation by another 20% or so.Gunnar Sletta2011-06-151-5/+3
| |
| * Speed up distance field generation by 5-20%Gunnar Sletta2011-06-151-1/+4
| |
| * Use linked list instead of QList for node children.Kim Motoyoshi Kalland2011-06-105-48/+118
| |
| * Removed matrix stacks from QSGRenderer.Kim Motoyoshi Kalland2011-06-109-603/+34
| |
| * Make min-heap member of QMLRenderer instead of stack variable.Kim Motoyoshi Kalland2011-06-102-46/+60
| | | | | | | | The heap is used to sort non-overlapping children.
| * Replaced QStack with QDataBuffer in the node updater.Kim Motoyoshi Kalland2011-06-102-26/+25
| |
| * Cut off blocked sub-trees one node earlier.Kim Motoyoshi Kalland2011-06-102-9/+8
| | | | | | | | Do not even enter the blocked node.
| * Removed QSGNodeVisitor inheritance from QSGNodeUpdater.Kim Motoyoshi Kalland2011-06-102-14/+54
| | | | | | | | This reduces the number of virtual function calls.
| * Added QSGNode::removeAllChildNodes().Kim Motoyoshi Kalland2011-06-102-1/+16
| |
| * Keep track of the number of geometry nodes in a sub-graph.Kim Motoyoshi Kalland2011-06-102-4/+18
| | | | | | | | | | If there are no geometry nodes in a sub-graph, there's no need to update it.
| * Doc: Cleaned up the scene graph documentation a little.David Boddie2011-06-093-7/+6
| |
* | Renamed QMLRenderer -> QSGDefaultRendererGunnar Sletta2011-06-153-10/+10
| | | | | | | | Change-Id: Ib1f00d45cecd3b438148adce2f7cf247030b2dfb
* | Print out a warning when attributes are enabledGunnar Sletta2011-06-151-0/+15
|/
* Merge branch 'threaded3'Gunnar Sletta2011-06-092-5/+11
|\
| * Don't fetch a context that is never to be usedGunnar Sletta2011-06-061-3/+0
| |
| * Fixed up command line options a bitGunnar Sletta2011-06-061-2/+11
| |
* | Introduced simple materialGunnar Sletta2011-06-092-0/+223
|/
* Small optimizations in distance-field cache.Yoann Lopes2011-05-242-13/+17
|
* Optimize distance-field glyph recycling.Yoann Lopes2011-05-231-0/+9
| | | | | Unused glyphs in the cache should not be overwritten if they are immediatly reused after being unreferenced.
* Fix typo in API: QSGContext::schdelueTextureForCleanup.Bjørn Erik Nilsen2011-05-232-2/+2
| | | | Reviewed-by: kim
* Fixes wrong flipping of textures.Bjørn Erik Nilsen2011-05-201-1/+1
| | | | Reviewed-by: Gunnar