aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
| * orient the fbo rendering the same way as other fbo rendering and enable ↵Gunnar Sletta2011-09-121-3/+6
| | | | | | | | | | | | | | | | | | multisampling Change-Id: Ibfb3bd9577efc50ca7654019638d22b9077df6bb Reviewed-on: http://codereview.qt-project.org/4627 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com>
| * Merge branch 'master' into refactorGunnar Sletta2011-09-12141-2928/+6120
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/declarative/cppextensions/qwidgets/qwidgets.pro examples/declarative/minehunt/main.cpp examples/declarative/minehunt/minehunt.pro src/declarative/items/context2d/qsgcontext2d.cpp src/declarative/items/qsgflickable.cpp src/declarative/items/qsgtextedit.cpp src/declarative/items/qsgtextinput.cpp src/declarative/particles/qsgangleddirection.cpp src/declarative/particles/qsgcumulativedirection.cpp src/declarative/particles/qsgcumulativedirection_p.h src/declarative/particles/qsgfollowemitter.cpp src/declarative/particles/qsgmodelparticle.cpp src/declarative/particles/qsgparticlesystem.cpp src/qtquick1/util/qdeclarativeview.h tests/auto/declarative/examples/examples.pro tests/auto/declarative/qsgfocusscope/tst_qsgfocusscope.cpp Change-Id: Ib4be2a5e742dee1a399d73da97161736f77448e5
| * | Make QSGItem::update() work when called from inside ↵Paul Olav Tvete2011-09-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QSGCanvasPlainRenderLoop::paint() If update was called in a function triggered by rendering, it would set the dirty flag without posting an update event. Subsequent render calls would just return without doing anything because the dirty flag was set. This could cause the applications UI to freeze up. Change-Id: Ib50403c1d9e22cc4680379f0c90fb2fcaa29c1d6 Reviewed-on: http://codereview.qt-project.org/4550 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | make quicktest build and modify to use qwindowMatthew Cattell2011-09-094-36/+37
| | | | | | | | | | | | | | | | | | Change-Id: Idebb00b828307421bcbd89d8abaa9ea1d903af47 Reviewed-on: http://codereview.qt-project.org/4542 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | Only polish once pr frameGunnar Sletta2011-09-091-2/+0
| | | | | | | | | | | | | | | | | | | | | Change-Id: I7295d0936dd220c092ed6c78b19fdf8ee3a3ce23 Reviewed-on: http://codereview.qt-project.org/4465 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Matthew Cattell <matthew.cattell@nokia.com>
| * | Explicitly ask input method to commit preedit when focus lost.Pekka Vuorela2011-09-082-12/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Takes advantage of new QInputPanel::commit() method. Change-Id: I0f09353c6ac7f5503ea9fda3a9bd79d0ae3da940 Reviewed-on: http://codereview.qt-project.org/4456 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * | get various autotests working for refactorMatthew Cattell2011-09-081-0/+2
| | | | | | | | | | | | | | | | | | | | | Change-Id: I35a9ce1421e87351a9ce4834158d201f84280a65 Reviewed-on: http://codereview.qt-project.org/4461 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | rename QSGGeometry::stride() to sizeOfVertex for symetry with indexGunnar Sletta2011-09-086-20/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | Also support GL_UNSIGNED_INT as index type when supported by GL Change-Id: I0988e102c8a04ce6cd02fb02528204ba810f853a Reviewed-on: http://codereview.qt-project.org/4453 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | Avoid compiler warning on unused variable.Pekka Vuorela2011-09-081-1/+0
| | | | | | | | | | | | | | | | | | | | | Change-Id: Ie3d08e91aee8ecd369cb10a0c8d7497de559c046 Reviewed-on: http://codereview.qt-project.org/4458 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * | Fix TextInput and TextEdit software input panel on qtquick1Pekka Vuorela2011-09-082-10/+6
| | | | | | | | | | | | | | | | | | | | | Change-Id: I39da7a877cef546da69bccfcf7ee1ae2ba92b208 Reviewed-on: http://codereview.qt-project.org/4455 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * | Adjust to the changes in the QInputMethodQuery event.Lars Knoll2011-09-081-2/+9
| | | | | | | | | | | | | | | | | | | | | Change-Id: I0c160f7635c87f63990ddc519cbc966ccab65f4a Reviewed-on: http://codereview.qt-project.org/4447 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
| * | Fix TextInput and TextEdit open/closeSoftwareInputPanel functionsJoona Petrell2011-09-082-24/+8
| | | | | | | | | | | | | | | | | | | | | Change-Id: I69bac4d1ce55271685dcddcc4c8ad2f6598e7630 Reviewed-on: http://codereview.qt-project.org/4439 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * | make sure we polishItems also in plain render loopGunnar Sletta2011-09-082-5/+6
| | | | | | | | | | | | | | | | | | | | | Change-Id: Ife8ab271c77a8daeaca9463e72296714aba17df9 Reviewed-on: http://codereview.qt-project.org/4430 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * | compile againGunnar Sletta2011-09-082-4/+21
| | | | | | | | | | | | | | | | | | | | | Change-Id: If041994fdadcd24f9b002bbcf76ce50f3b56ce87 Reviewed-on: http://codereview.qt-project.org/4431 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | Rename ImMicroFocus to ImCursorrRctangleLars Knoll2011-09-082-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Also set ImhMultiLine on the TextEdit Change-Id: I563fef803660e35f39cdf1b40526356bfc0581e0 Reviewed-on: http://codereview.qt-project.org/4415 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * | Handle ImEnabled and ImHints input method queries in QSGTextInput and ↵Joona Petrell2011-09-082-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | QSGTextEdit Change-Id: I348f924f2987f1c163c89ce4eef18fe864ec665d Reviewed-on: http://codereview.qt-project.org/4407 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
| * | Fix a typo in the method nameLars Knoll2011-09-081-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8f5ca3203058dce6cc4835a5b1cd6aa0c190bcac Reviewed-on: http://codereview.qt-project.org/4406 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Vesa Rantanen <vesa.rantanen@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * | Ensure the itemTransform in QInputPanel is always up to dateLars Knoll2011-09-082-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Hook into the render loop and update the itemTransform in the QInputPanel before we repaint. Change-Id: If9122ba0fbe31cff3bfcc3edc48f684cc9b16984 Reviewed-on: http://codereview.qt-project.org/4405 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Vesa Rantanen <vesa.rantanen@nokia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
| * | Adapt to the input method changes in qtbaseLars Knoll2011-09-083-34/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Start using the QInputPanel instead of the QPlatformInputContext. Make sure we do something with both QInputMethodEvent and QInputMethodQueryEvent. This gets input methods partially working on TextInput fields. Change-Id: I4655f5599673325ffb75207573635afccd069a65 Reviewed-on: http://codereview.qt-project.org/4404 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Vesa Rantanen <vesa.rantanen@nokia.com> Reviewed-by: Andy Nichols Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * | Fix QSGshaderEffectTexture cleanupGunnar Sletta2011-09-073-23/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | Because we often created it too early it did not have a QSGContext and would thus not clean up properly, causing crashes. Change-Id: I1f5c82c87326254885ec217aaab4f1e79d18a243 Reviewed-on: http://codereview.qt.nokia.com/4329 Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
| * | make render timing an environment variableGunnar Sletta2011-09-071-13/+26
| | | | | | | | | | | | | | | | | | Change-Id: Iadc72a0beb5e6d700b0110d11116a7533c69f311 Reviewed-on: http://codereview.qt.nokia.com/4338 Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
| * | Added QSGGeometry::Attribute::isPosition to give a hint about vertex dataGunnar Sletta2011-09-075-34/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | Also added a QSGGeomtry::sizeOfIndex() function for convenience Change-Id: If1f13afd4c1c5295dcfb00254144ef6b8b8b7878 Reviewed-on: http://codereview.qt.nokia.com/4307 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | move QSGNodeUpdater into private header where it belongsGunnar Sletta2011-09-074-42/+42
| | | | | | | | | | | | | | | | | | | | | Change-Id: I5cb12cac3d49cfd9b1682b405e65b2cdea4eb57d Reviewed-on: http://codereview.qt.nokia.com/4306 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | qsgcanvas autotest made to work with refactor and added break statement to ↵Matthew Cattell2011-09-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | qsgcanvas.cpp in event processing amended wait times / changed include for private headers Change-Id: I4f790907268be357986e181e4624f8e54efcb2ec Reviewed-on: http://codereview.qt.nokia.com/4256 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | properly initialize the dptr of QSGCanvas in the default constructorZeno Albisser2011-09-021-1/+1
| | | | | | | | | | | | | | | | | | | | | Change-Id: Ibefa8fe0ca73674e817b87782821a26a316e8042 Reviewed-on: http://codereview.qt.nokia.com/4124 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
| * | Add QSGFlatColorMaterial::compare for better sortingGunnar Sletta2011-09-012-0/+10
| | | | | | | | | | | | | | | | | | | | | Change-Id: Ic6229c777a30191ba131b3896984da4f3fecc9d5 Reviewed-on: http://codereview.qt.nokia.com/4066 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
| * | add flags to node debug outputGunnar Sletta2011-09-011-1/+2
| | | | | | | | | | | | | | | | | | | | | Change-Id: Idc5f542a40d98b8163fb894e26e53127d1b6369c Reviewed-on: http://codereview.qt.nokia.com/4065 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
| * | Remove the remaining dependencies onto QtWidgetsLars Knoll2011-09-0137-98/+83
| | | | | | | | | | | | | | | | | | Change-Id: I49efc4d0af4c19c24515ecfaa5c549e36f442cc8 Reviewed-on: http://codereview.qt.nokia.com/3992 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
| * | Use QMouseEvent instead of QGraphicsSceneMouseEventLars Knoll2011-09-0124-404/+239
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QMouseEvent now supports floating point coordinates, and the graphics scene event is not be available in QtGui anymore. Change-Id: I28ab428a2d00fc1deef55b05c1c545e74838e105 Reviewed-on: http://codereview.qt.nokia.com/3991 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
| * | Support font color with Text.StyledText in SceneGraphEskil Abrahamsen Blomfeldt2011-08-311-22/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When Text.StyledText is set as format, QML will use a QTextLayout back-end with additional formats to render styled text, supporting a few HTML tags. To support color changes using this format, we need to process the additional formats in the text node. The code that fetches glyph runs is now separated into its own function and is called once per color-changing format if any such exist. Task-number: QTBUG-21199 Change-Id: Ib9b0cbec8d23de2dfafae9f641a2e3f7819c6a7a Reviewed-on: http://codereview.qt.nokia.com/3982 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
| * | Fix export symbols for QtDeclarative and QtQuick1.Friedemann Kleint2011-08-3157-126/+150
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix build on Windows and compiler warnings. Requires 090ee21eac7257644422e35395194e5fd7fb8efa in qtbase. Change-Id: Ief8da504ccd3e2c2e78644cc9943d685c4302019 Reviewed-on: http://codereview.qt.nokia.com/3988 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
| * | Merge remote-tracking branch 'origin/master' into refactorLars Knoll2011-08-318-42/+307
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/declarative.pro Change-Id: I9c6d8447e1254c6acd32fa0775ff6a79d0d66acd
| * \ \ Merge branch 'master' into refactorGunnar Sletta2011-08-31155-11945/+10432
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/v8 src/declarative/declarative.pro src/declarative/items/qsgcanvas.cpp src/declarative/items/qsgshadereffectsource_p.h src/declarative/items/qsgview.cpp src/declarative/particles/qsgcustomparticle.cpp src/imports/gestures/gestures.pro src/imports/particles/particles.pro src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro src/qtquick1/qtquick1.pro tests/auto/declarative/examples/examples.pro tests/auto/declarative/qsglistview/qsglistview.pro tests/auto/qtquick1/qdeclarativeviewer/qdeclarativeviewer.pro Change-Id: I423344f83e1835116cad531b877fde6e68a8849a
| * | | | Compile, qtextureglyphcache_gl_p.h -> qopengltextureglyphcache_p.hSamuel Rødal2011-08-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9862c736090d902fe328f1e7ad6a9a3b17389f38 Reviewed-on: http://codereview.qt.nokia.com/3865 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
| * | | | Don't create the ShaderEffect node when attributes are missingGunnar Sletta2011-08-301-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib291b9b3bbf2f421998e2c8d92e34fb88f53a5c7 Reviewed-on: http://codereview.qt.nokia.com/3848 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
| * | | | Implement backtrace debug output of leaked texturesGunnar Sletta2011-08-301-13/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9aeece87aae393eadd32503af5eb7cd1508a732c Reviewed-on: http://codereview.qt.nokia.com/3849 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
| * | | | Fix crash due to uninitialized QOpenGLContext.Morten Sorvig2011-08-291-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id3870f1e438742d514710ceb39808b1f93f2d25d Reviewed-on: http://codereview.qt.nokia.com/3737 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | | | Get declarative running on new gui/opengl stack.Samuel Rødal2011-08-2944-198/+214
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename QGuiGLContext -> QOpenGLContext, QGL* -> QOpenGL*, etc. Change-Id: I08379029d756e28b20ae141ca30ed801626b513d Reviewed-on: http://codereview.qt.nokia.com/3711 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
| * | | | Respect QPlatformIntegration::ThreadedOpenGL and fix thread affinity of the ↵Gunnar Sletta2011-08-292-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QSGContext Change-Id: I3a63e8a3d515bfb41895f7717d534a46e2ab2bde Reviewed-on: http://codereview.qt.nokia.com/3705 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | | | implement non-threaded renderer againGunnar Sletta2011-08-291-1/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I17983667374d0ee7cf2a4a8907680671cef661d5 Reviewed-on: http://codereview.qt.nokia.com/3701 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | | | separated out render thread codeGunnar Sletta2011-08-293-90/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9e440ef172055f626c908d4dd733d0243feb77c9 Reviewed-on: http://codereview.qt.nokia.com/3700 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| * | | | Merge branch 'master' into refactorGunnar Sletta2011-08-25262-5259/+14669
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/items/qsgcanvas.cpp src/declarative/items/qsgitem.cpp src/declarative/items/qsgtextnode.cpp tests/auto/declarative/examples/examples.pro tools/qmlviewer/qmlviewer.pro Change-Id: Icbb0ef5dc79b658c62fd2b2c25a66c9bb3cbeb10
| * | | | | Warn when grab() is called outside the GUI thread.Gunnar Sletta2011-08-241-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I24eb1c5c884e80017d8a1123120538553e825064 Reviewed-on: http://codereview.qt.nokia.com/3443 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
| * | | | | export QSGTextureProviderGunnar Sletta2011-08-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1d92947c46aa5e33a828866959509b367ad6da46 Reviewed-on: http://codereview.qt.nokia.com/3324 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
| * | | | | QT += sql as we are always using itGunnar Sletta2011-08-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4cf96814482cdf3877965bacf2b9defdc55894ad Reviewed-on: http://codereview.qt.nokia.com/3318 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
| * | | | | Make textureProvider() a virtual accessor in QSGItem.Gunnar Sletta2011-08-2212-40/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This gets us one step closer to a public QSGTextureProvider API. This patch also includes a fix to the material ownership in QSGCustomParticle. Change-Id: I620e3006816db0c37eedf3a20a0d4cbe7a783b82 Reviewed-on: http://codereview.qt.nokia.com/3317 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
| * | | | | show also blocked subtree's when dumping the graphGunnar Sletta2011-08-221-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4c35c0aae6dcbe51a01edc49118f3375d6f5a8f1 Reviewed-on: http://codereview.qt.nokia.com/3313 Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
| * | | | | Don't create the scale grid in the rendering thread.Gunnar Sletta2011-08-221-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iee65fe64fa659a6371a05c7ab1c964331fd5605a Reviewed-on: http://codereview.qt.nokia.com/3183 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
| * | | | | Reintroduce the QSGTextureProvider as a separate objectGunnar Sletta2011-08-2213-112/+211
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The texture provider needs to live completely in the rendering thread and needs to be selfcontained during rendering. During the items updatePaintNode() all needed state is copied into the texture provider. Texture providers have thread affinity in the rendering thread and are deleted there using deleteLater() and the added processEvents() in the rendering loop. This fixes the bug where a QSGItem is deleted as a result from an animation while the same item is being used as a texture provider in the rendering thread. There is also a small optimzation to QSGShaderEffectSource in that we don't create a paint node when the shader source is not going to be shown. Change-Id: I6b9bc1da2a0f55d3d5356d4091fd6af6a7ea6f01 Reviewed-on: http://codereview.qt.nokia.com/3293 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
| * | | | | Move QSGShaderEffectMaterial into the QSGShaderEffectNode. Now owned by ↵Gunnar Sletta2011-08-224-10/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Render Thread Change-Id: Ib80fab95780bab8e620b4696cfde3c4777f4eb93 Reviewed-on: http://codereview.qt.nokia.com/3292 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-20 19:49:35 +0000