summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add explicit include for QCoreApplication to satisfy some compilersr2d-5.5Andy Shaw2015-12-101-0/+1
| | | | | Change-Id: I9ebe3d6599c845f0115fbd53b9584896faf146f3 Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
* Add tests directory to enable coin integrationAndy Nichols2015-10-134-0/+20
| | | | | | | | There are no actual tests yet though, but now we don't fail the build in coin because there is no tests folder. Change-Id: I7843fb78d1bd0986db69f2706d8738061762e6cb Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* Update Copyright and License headersAndy Nichols2015-08-1828-285/+281
| | | | | Change-Id: I308ac6bc053ed2648802f433e01be92f36e223b8 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* Bump module version to 5.5.1Andy Nichols2015-08-181-1/+1
| | | | | Change-Id: I25ddccfedbef2e62f64c3284cb43d66aa014b6c6 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* turn off image format conversion in PixmapTextureJoerg Bornemann2015-08-031-1/+3
| | | | | | | | | | Avoiding the conversion potentially saves memory and conversion time. Also, it guarantees that the pixmap format doesn't change just by assigning it to a texture object. E.g. QtWebEngine relies on that. Task-number: QTBUG-47328 Change-Id: I4dae1492d581ea406cf86906ed0ed2c126252257 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* fix namespaced buildJoerg Bornemann2015-07-092-0/+6
| | | | | Change-Id: I319f73aaeef2656dc628873a460607d6944d7432 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Remove custom documentation footerKai Koehne2015-06-151-23/+0
| | | | | | | | | The footer is outdated (2014, Digia ...). Anyhow, the documentation of other commercial items is released under GNU Free Documentation License too, so let's just use the standard footer. Change-Id: I6d3e89bc7e112ad99c62a356d8a16c3bf389e5cf Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* Fix name of documentation as shown in ContentsKai Koehne2015-06-151-1/+1
| | | | | | | Make the title align with the other Qt components. Change-Id: I38d4728cad007b6389c2a541ffc3b228a621fe70 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* Bump module version to 5.4.1Andy Nichols2015-01-201-1/+1
| | | | | Change-Id: I5a5d282e1641e76be662978cd95130385a9a65bc Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* Doc: Fix various issuesTopi Reinio2015-01-144-11/+9
| | | | | | | | | | - Update privacy policy URL - Remove unnecessary \targets - Ensure Qt Quick and Qt Graphical Effects modules are linked to correctly Change-Id: I45cbf60ad07db1a74c250f0192ea8c674513f696 Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
* Doc: review documentation 2D RendererNico Vertriest2015-01-135-78/+60
| | | | | Change-Id: Ic31014844066025a903b2d33f5780f4f8e046f72 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Mention the caveat of text rendering in the known limitationsSimon Hausmann2015-01-081-0/+6
| | | | | Change-Id: I87f733f6b15e1987d7ae6b83c716c578ce4edadb Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
* Remove deprecated macro to enable build with Qt 5.5Andy Nichols2015-01-082-17/+0
| | | | | Change-Id: Ia1a49a806dc2f822bee92787a45a49a4bc3c573f Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Account for Device Pixel Ratio when rendering QSGLayerAndy Nichols2015-01-082-3/+7
| | | | | | Change-Id: I3570a6ee87786f1459a922bd43f38d1bbbe2c640 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Paul Tvete <paul.tvete@theqtcompany.com>
* Fix rendering of RectangleNode when devicePixelRatio != 1Andy Nichols2015-01-082-38/+57
| | | | | Change-Id: Ice0f274afe5ca5e5f453bddc3c3b63f44bbef06c Reviewed-by: Paul Tvete <paul.tvete@theqtcompany.com>
* Use the new QSGSimpleTextureNode::sourceRectJocelyn Turcotte2014-12-171-0/+4
| | | | | | | | | QtWebEngine always receives 256x256 large tiles, but is being told which part of the texture should be painted if the content is effectively smaller on a tile. Change-Id: Ie979562fb948c853e22155e3f7f3807ae10558ef Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Support QSGLayer::setRectJocelyn Turcotte2014-12-173-0/+4
| | | | | | | | | Carry any non-full rect from the layer to QPainter::setWindow. This is needed by cc::RenderPass::output_rect in QtWebEngine. Change-Id: I8ffd7f0b7646e664a225df096de455899338d4ba Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Fix crash for borderimage with negative bordersaavit2014-11-251-2/+10
| | | | | | | | | Replace negative margin values with 0. Test case: qtdeclarative/tests/manual/scenegraph_lancelot/data/borderimages/borderimage_rotated_unsmoothed_negative_borders.qml Change-Id: I53d143fd079cbaa5e6c8080ada81720f8b1b598b Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@theqtcompany.com>
* Doc: Add some basic documentationAndy Nichols2014-11-1810-65/+385
| | | | | Change-Id: Id6f986bc5d46912355f42e6ae8d72fe2738c2c19 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* Logging: use category names different from those in declarativeRichard Moe Gustavsen2014-11-184-74/+104
| | | | | | | | | | | Otherwise we end up with duplicated symbols when linking statically. This partly reverts commit 139ace5b57b82396dc37a6781bfae4a251172764. Change-Id: I0b33cc00d19e7c541b33a72a7d27e1c0a895d988 Task-number: QTBUG-42679 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* Logging: include logging categories from qsgcontext_p.hRichard Moe Gustavsen2014-11-171-24/+1
| | | | | | | | | | | The logging categories used in this module are already defined in qtdeclarative, which this module depends on. We could just use Q_DECLARE_LOGGING_CATEGORY instead of Q_LOGGING_CATEGORY, but even simpler is to just include the private header file where they are already declared. Change-Id: I5adb0cfc5fd4fed234935820e52d7c7e7a797fae Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* Improve quality of RectangleNodes when rotatedAndy Nichols2014-10-212-31/+68
| | | | | | | | | | | | | | | | | | | | When there is a rotation transformation on a RectangleNode it is not possible to take advantage of accelerated blitter paths, but we still need to do custom painting to recreate the behavior of a Rectangle component in Qt Quick. Now when there is a rotaiton transformation we will fall back to using QPainter::drawRect as long as there is no border or radius. If there is a border or radius value set though we will instead first render to a QPixmap before painting as the standard behavior of QPainter::drawRect and QPainter::drawRoundedRect does not match the expected behavior of a QQuick Rectangle item. This fixes the poor quality of rotated Rectangles at the cost of speed. The Rotation of any item should still be discouraged for performance reasons, but at least now Rectangles itmes should look correct when used. Change-Id: I3919ad732c9b4354a95e28e8dc09fcefd53f604e Reviewed-by: Eirik Aavitsland <eirik.aavitsland@digia.com>
* SoftwareLayer: markDirtyTextureLater() slot was removedAndy Nichols2014-10-202-13/+1
| | | | | | | | This issue was fixed in qtdeclarative a slightly different way, so now we need to change our code to reflect the change. Change-Id: I5c050da88efc32e808ad5a4a764ff410544db1cd Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* Fix build error with latest QtDeclarativeAndy Nichols2014-09-301-1/+0
| | | | | Change-Id: Id4b87c285370182b34ec42cf02c59627e8019956 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* Remove Q_UNREACHABLE from RenderingVisitorAndy Nichols2014-09-301-2/+2
| | | | | | | | | There will be times when we hit custom QSGGeometry nodes where we won't be able to render them. Rather than crashing, just ignore them. The Q_UNREACHABLE macro was more for the development phase anyway. Change-Id: I4962cab17b8b3399e081dba58c3a7c4dd988de8f Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* Make sure to clear backingstore with Source Composition ModeAndy Nichols2014-09-301-1/+2
| | | | | | | | This prevents blending with either garbage or the contents of the previous buffer when clearing with colors with an alpha. Change-Id: I52fc13c2af224a37206e51efd38301b95085c9b2 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* Fix build error in latest qtdeclarativeAndy Nichols2014-09-112-3/+3
| | | | | Change-Id: Icd2dbadaa0302ceaf06daaeb26b10cb9403cc492 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* Ensure that markDirty is called when neededAndy Nichols2014-09-113-2/+51
| | | | | | | | There were many cases where properties of nodes could change but since the node was not marked dirty, the scene update was never rendered. Change-Id: I7740a43d98521073056f85fe80d6c1ff213236a3 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* SoftwareLayer::grab must call QSGRenderer::renderScene to work correctlyAndy Nichols2014-09-112-5/+9
| | | | | | | | | | If QSGRenderer::renderScene is not called by SoftwareLayer then any updates in the scenegraph will not be reflected in that layer. This is the "live" but not "recursive" situation. Change-Id: If55cc71b3932e283855e3a1f9ff1bca5e07f4498 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix build warningsAndy Nichols2014-09-113-3/+4
| | | | | Change-Id: I842c8cd117f1e25cc7848618e86d2aff2e5e522f Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Add support for Image mirror propertyAndy Nichols2014-09-112-4/+22
| | | | | | | | | | The is probably not the ideal path (as there is at least one copy), but we can document that mirror is slow. There is no clear path to blit mirrored though, so it is better to do this than to render un-mirrored or use QPixamp.toImage().mirrored().toPixmap() Change-Id: Ife751f3635e8f9d8ea08676fb1f263bdb727aa2f Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix typo in sync.profileAndy Nichols2014-09-101-2/+0
| | | | | Change-Id: Id20ae015bd4cb4c8d2354ae2f70e514e1545fee3 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* Improve rendering quality of RectanglesAndy Nichols2014-09-092-28/+69
| | | | | | | | | | | | | The existing implementation has both inaccurate drawing of borders as well as many alignment issues. Much of these alignment issues are due to our use of floating point sizes and the integer based nature of blitter hardware. So now for the Rectangle node we force alignment via the use of whole numbers. This should be a better compromise of speed vs accuracy than previously. Change-Id: I9d8e9d1b3347a99bf0c2ae65ec66c935d8017817 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Check for Threaded Pixmaps capability for threaded rendererAndy Nichols2014-09-091-1/+6
| | | | | | | | | | | By default we used the threaded renderer, but this will only work if the platform has the capability to render to QPixmaps from multiple threads. Now if we don't have the Threaded Pixmaps capability we use the non-threaded render loop. Change-Id: I5090e874d0bbdd1e54561ea3583a5a17bbf50061 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Support rendering Gradients when stops are not between 0 and 1Andy Nichols2014-09-091-1/+88
| | | | | | | | | | | | QGradient does not allow stops positions that are outside the bounds of 0 and 1. Gradients created from QML however can have stops outside of these bounds and so we must normalize these stops before giving them to QPainter to render. This change creates a new stop at 0 or 1 if a stop goes below or above the bounds respectively, and interpolates a new color value for the stop based on the original position. Change-Id: I10cc41d923e88a9b41bfd27de0326cea25464add Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Build softwarecontext plugin using load(qt_plugin)Andy Nichols2014-09-031-9/+4
| | | | | | | Should resolve issues with deployment. Change-Id: I268734e5db67d3f2bc3afa603618270985387b30 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Add OpenGL dummy libraries to projectAndy Nichols2014-09-0214-0/+6660
| | | | | | | | | | Qt still depends on OpenGL even if we dont plan on using it. The OpenGL dummy library provides the OpenGL and EGL headers and sharded objects necessary to build Qt with OpenGL ES2 support. Change-Id: I588f819b108834486a14769a8c1740e86a14bc24 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Added needed files to generate documentationAndy Nichols2014-09-023-0/+64
| | | | | Change-Id: I03a56701f0314e935f4acc610e1335b23b7d921a Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Reformat project to be a Qt ModuleAndy Nichols2014-09-0233-3/+23
| | | | | Change-Id: I2fe8df530a687247a9cd7ea12c1d8de79fef506e Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Provide a default SurfaceFormat for our ContextAndy Nichols2014-09-012-2/+10
| | | | | | | | | | | Since we are not using OpenGL the content of the SurfaceFormat does not matter to us. Instead it gives us a way to expose the fact that we are rendering to a raster surface. Using the OpenGLInfo API from QML allows you to check the properties of the SurfaceFormat and see that the QSurfaceFormat::RenderableType is not OpenGL or OpenGLES. Change-Id: Iac087dd89115f3455b4fb1941385352cadd2a364 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Add path for QQuickShaderEffectNodeAndy Nichols2014-09-011-0/+3
| | | | | | | | | We can not easily determine what to render in this case so for now we do not render anything, but at least now we do not hit Q_UNREACHABLE when iterating through the scene graph. Change-Id: Ia6cc4be35ba4d977ffc7b52f6370539a0443c63b Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Correct painting of RectangleNodeAndy Nichols2014-09-012-13/+143
| | | | | | | | | | | | The previous behavior was very wrong compared to how QtQuick normally paints Rectangle elements. The border.width property does not effect the geometry of the Rectangle, where as QPainter::drawRect draws a border 0.5 the border.width around the edge of the rectangle. So now there is special logic to draw the each case correctly using fillRect as much as possible. Change-Id: I4ea2be2226ff3b1a11dc5000522df503c6f43227 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Update PainterNode now that QQuickPaintedItem is a texture providerAndy Nichols2014-08-274-0/+20
| | | | | | | | | We now have to return an QSGTexture, which in practice for software context does not mean a whole lot. In this cause it would generally be used for ShaderEffects which we don't support anyway. Change-Id: I63c17327aa541ac853d124daba28e1a512d11ea2 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Add support for rendering QSGSimpleTextureNode'sLars Knoll2014-08-252-9/+20
| | | | | | | | With this change, Canvas works correctly, at least in Image mode. Change-Id: I6641c07b031870dad3c7f9f50ece163724ad429a Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Add support for rendering QSGSimpleRectNodeAndy Nichols2014-08-251-2/+13
| | | | | Change-Id: Ic43877a9128cf0f944abeefd7819f8e99175fbeb Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Add support for rendering QQuickPaintedItemAndy Nichols2014-08-257-2/+296
| | | | | Change-Id: I80dbd2003f53e21fa35ebd270ecc92cc03628454 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Revert "Save and restore changed QPainter properties"Louai Al-Khanji2014-08-183-19/+2
| | | | | | | | | The above commit was accidentally pushed. This reverts commit 4e55b36b29e2114c7edfd53b62f04a6029bab6d6 Change-Id: I48bf983475e98365b62302ff0c37234a73774b79 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Save and restore changed QPainter propertiesLouai Al-Khanji2014-08-183-2/+19
| | | | | Change-Id: I67c604aa43d03207fd18fb41f54b445bd6bb34d9 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix text renderingSimon Hausmann2014-08-181-0/+1
| | | | | | | | | | | | | | Since we don't save/restore the painter state for each node, we have to be careful that settings don't "leak" across paint calls. For example a rectangle node with a gradient will leave the painter with a brush set. A sub-sequent child text node will be rendered incorrectly. This patch corrects that by setting the brush explicitly to the empty brush. This fixes also the examples/quick/views rendering. Change-Id: Ia1415b5fdf77a560b02719917d36298e808418f1 Reviewed-by: Louai Al-Khanji <louai.al-khanji@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix compilation warning on MSVC2013Louai Al-Khanji2014-08-151-1/+3
| | | | | | | | | | | | | In constructs like the following: QSGRenderContext */*rc*/ MSVC parses the commented out variable name "rc" after the pointer star as signifying the end of a C-style comment. Do the proper thing and use Q_UNUSED within the function Change-Id: I149ccf10e7db4762adc8510d8cba864171c5db36 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>