summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update to support builds with Qt 5.10+HEADmasterBrett Stottlemyer2018-06-161-1/+1
| | | | | | | The pattern used for version matching breaks with two digit minor releases. Change-Id: I08b70fcccbff5ee7d47bc2752b01552447bd8468 Reviewed-by: Michael Brasser <michael.brasser@live.com>
* Enable shader cache for 5.8Michael Brasser2017-05-122-2/+24
| | | | | | | | This is still useful for 5.8, since a built-in solution isn't available until 5.9. Change-Id: I63df1012a05ecf798bbd8d3aa47fd2a290ababf5 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Fix compile with OpenGL ES 3.Michael Brasser2016-07-051-0/+5
| | | | | Change-Id: I46a5b615f219bfddc77058cc30e3e1bd61f44333 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
* Fix simplerenderer with devLaszlo Agocs2016-07-055-2/+52
| | | | | Change-Id: I1815cfc31e46b7f5f22272d9389fba9b0154d1ab Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
* customcontext: Add linkage to libEGL for all cases that use symbols from it.Robin Burchell2016-05-191-1/+3
| | | | | | | Failure to do so causes runtime errors when using -Wl,--as-needed. Change-Id: If3687acbac06f13caba5ca3c7f3fdc33710fc5ab Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* Pick up stencilclip shaders from the qt-project subfolderGunnar Sletta2016-04-281-1/+7
| | | | | Change-Id: I6fbc08be9148c772423d9225921fc1b2b1bf7444 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
* Reset clipping state after a completed frame.Gunnar Sletta2016-04-282-0/+10
| | | | | | | | Failing to do so, will result in clip being wrong on the following frames. Change-Id: If3a5f9c7ecb056d6cf2c50fe2f326abeaad0ddb8 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
* Make customcontext compile with 5.6Gunnar Sletta2016-04-282-0/+60
| | | | | Change-Id: Ifa0ed35e8117e8df4fddb78a169073e558cc6cc9 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
* [hybristextures] Prevent deleting native buffers while still in useMikko Harju2015-10-292-11/+6
| | | | | | | | | | | Share the NativeBuffer and release when the last reference is gone. This prevents too early deletion of the NativeBuffer owned by the texture factory while the buffer is still being used through a non-owning HybrisTexture. Change-Id: I151b616df74b1590341af6fcfdc7674a98b55215 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* Fix compilation with Qt 5.5Christophe Chapuis2015-09-233-17/+65
| | | | | | | | Add PREMUL and qt_div_255 here since we don't want to rely on a private header. It has changed in Qt 5.5, breaking compilation. Signed-off-by: Christophe Chapuis <chris.chapuis@gmail.com> Change-Id: Ie17a564da41f5039892eb6194218500c93ee0449 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* Introduce SimpleRenderer, more similar to the old default one.Gunnar Sletta2015-04-276-0/+1052
| | | | | | | | | | | | | | | | | | | | - It doesn't do any fancy stuff, and will as a result be faster during the 'sync' phase at the cost of being slower during the 'render' phase. - Uses very few support structures and has lower memory footprint than the batched renderer. - Keeps all geometry, both for graphics and clipping, in one VBO/IBO pair, resulting in that switching clips becomes relatively cheap. However, there is no partial upload, if something changes, everything is uploaded again. - Draws every single geometry in a separate call. No batching, no optimized scrolling, etc. Change-Id: I561a65833ec286340a9ffb3e44c55b76929b8137 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* Fix badly placed ifdefGunnar Sletta2015-01-291-2/+4
| | | | | Change-Id: Id6fe22975f1fe46dfa71832441f52b1ba947fd99 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
* Add default values matching base QSGRenderContext::compile().Michael Brasser2014-08-221-1/+1
| | | | | Change-Id: I687334cd79cbf5f0cb00ed0e60fd502308c4910e Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* Remove the use of QAnimationDriver::startTime().Gunnar Sletta2014-08-202-10/+14
| | | | | | | The implementation in 5.4 doesn't need it anymore. Change-Id: Icef27eb697a48d4bc6af909e563921f3a680adc0 Reviewed-by: Michael Brasser <michael.brasser@live.com>
* Compile on desktop.Gunnar Sletta2014-08-191-3/+5
| | | | | | | Some headers need to be included before others, it seems. Change-Id: Id62527c21c2755e1bd0a85f16b4fa377bf8af373 Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* Fix typo in ifdefGunnar Sletta2014-08-191-1/+1
| | | | | Change-Id: Ica9ddcacb57dc13a778fa5b7b609520f267ecfed Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* Delay querying for EGL extension string until we are live with GLGunnar Sletta2014-08-152-11/+23
| | | | | Change-Id: I7317a5157d7692f6e3357479a5b4c0c7906c3f77 Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
* Introducing texture support based on EGL_HYBRIS_native_buffer.Gunnar Sletta2014-08-085-0/+578
| | | | | | | | | | This is the equivalent of eglgralloctexture, except it uses an EGL extension and will for that reason only depend on libEGL and not Android's libhardare and SDK. Change-Id: Ib06d56d62566bfe77a55690f51139d395540f254 Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* Fail gracefully if EGL image creation failedGunnar Sletta2014-08-071-2/+7
| | | | | Change-Id: Iacd5542ca5bc27afab7ea5f27afec4debe69be74 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* Limit eglgralloctexture to 32-bit formats and make them all work.Gunnar Sletta2014-06-271-11/+60
| | | | | Change-Id: I953d91550ceeb7f21dccfdc5515d3e19a6c16654 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Support eglgralloctextures through QQuickWindow::createTexture().Gunnar Sletta2014-05-264-20/+71
| | | | | Change-Id: I8cbdfde5b47beb849327e4ae61c5009005ffc79c Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Safeguard program binaries from filling up the filesystem.Gunnar Sletta2014-03-061-1/+65
| | | | | | | | | | | Most QML applications will never have this problem as they use a small amount of shaders and the cache will reach a max of 20-30 shaders. This is only a safeguard against applications which recompile new shaders all the time. Change-Id: If6dbb6da4eff82e2a4e43a9414a45a7bf4ce762a Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* EGLImage/gralloc based texturesGunnar Sletta2014-02-255-2/+508
| | | | | | | | | | | All the work relating to the texture upload is done on the pixmap loader thread when the texture factory is created. QSGTexture::bind() on the render thread then becomes a zero-cost operation, which is very beneficial for large images which tend to block the render thread for 10s of milliseconds. Change-Id: I2d9eb15e64c435d58e454641dda7d588d6b236f4 Reviewed-by: Michael Brasser <michael.brasser@live.com>
* Ensure m_materialPreloading is properly initialized.Michael Brasser2014-02-201-0/+1
| | | | | Change-Id: I3e97c83657d63f01cde5bbf8832f1026773a0f53 Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* Make overlaprenderer and materialpreload work with Qt 5.2Michael Brasser2014-02-175-25/+140
| | | | | | | | | | When building with Qt 5.2 or higher, a warning will be printed when using the overlaprenderer, as the default batchrenderer should typically be a better alternative. materialpreload will be relevant only if the overlaprenderer is used. Change-Id: I4899f8b4f45210c03fe08b1bb0940763683c99b3 Reviewed-by: Michael Brasser <michael.brasser@live.com>
* Adaptive fixed or time based animation stepsGunnar Sletta2014-02-132-29/+92
| | | | | Change-Id: I6108531e2abfcb43ed27f68caa7e34eab289f863 Reviewed-by: Michael Brasser <michael.brasser@live.com>
* Program binary support via (GL_OES_get_program_binary).Gunnar Sletta2014-02-134-2/+293
| | | | | Change-Id: I7993318d52a4c7f30865d3ccbca7aa2efc9d010f Reviewed-by: Michael Brasser <michael.brasser@live.com>
* Make nonpreservedtexture work with Qt 5.2.Michael Brasser2014-02-053-13/+25
| | | | | Change-Id: I2a51af6833f2d651e5a3b456197594f722fac741 Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* Make customcontext work with updated 5.2.0 API.Gunnar Sletta2014-01-303-95/+153
| | | | | Change-Id: I3560282009b762759f96d77db40c86610cb54e62 Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* Removed animators, part of 5.2Gunnar Sletta2014-01-1580-7776/+1
| | | | | Change-Id: I43cdc7f36f4bfeb88b71d8b216ab459cb87566f5 Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* Make multisampling and defaultSurfaceFormat opt-inGunnar Sletta2014-01-153-2/+12
| | | | | Change-Id: I13922fb3367ab1ac427e3b874147fbfcaa45227b Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* Make animation catchup plain and simpleGunnar Sletta2014-01-152-51/+9
| | | | | Change-Id: Iee2ff60e9f3c6509cb16ab7410fbe994ee0c5256 Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* Add image provider that handles AMD_compressed_ATC_texture textures.Michael Brasser2013-12-109-0/+509
| | | | | Change-Id: Icb790c13ed37af2c1191078ec7ebafef818fcd69 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Isolate rectangle to avoid upload of the tableGunnar Sletta2013-12-091-0/+2
| | | | | Change-Id: I77e87c35f24707bbf2a6beeeb1cd4e925886c975 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* FlyingIcon and ExtremeTable benchmarksGunnar Sletta2013-08-146-0/+213
| | | | | Change-Id: I450f0b6eb77e9fcc462a4f1f35033aba9324b3f9 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Updated licenses and contact detailsTeemu Kaukoranta2013-06-1963-84/+84
| | | | | | | | Contacts and licenses updated using replace_copyrights_contacts.sh and licence_tag_adder.sh from mkdist repo. Change-Id: Icc9aabf4701363da94fe4b04eaeca1b657f422f1 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Say hello to Qt.labs.shapes 0.1Gunnar Sletta2013-05-2821-0/+1944
| | | | | | | | | | | | | | | | | | | | | | | | | | The shapes plugin provies three element types. 1. TriangleSet - which encapsulates a set of triangles including read/save logic to a very basic textual format. Binary can of course be added later... It also contains a set of path commands and uses Qt's triangulator internally to convert a path into triangles. 2. Polygon - Renders a flat shaded triangle set. 3. MaskedImage - Reads two triangle sets in addition to an image and splits the image into a opaque and blended part, making it possible to greatly reduce the blending needed for drawing large bitmaps which are largely opaque. There is also a maskmaker tool in the tools subdirectory which provides a simple means of generating masks for the MaskedImage Change-Id: Ia00f059fb81872e6ca1dca78baf3073c9581acab Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Replaced Nokia copyrights in headerTeemu Kaukoranta2013-05-2362-62/+62
| | | | | | | | | | | | | | | | | | | | | | | | Replaced old Nokia copyrights with Digia copyrights. "All rights reserved" strings without leading copyrights were removed (for example, 'Copyright SomeCompany, all rights reserved remain untouched). Did NOT touch contact details, will change them later. Excluded folders that have '3rdparty' in path. Used command: find . -path '*/3rdparty/*' -prune -o -exec grep -ilI -E '.*Copyright.*Nokia.*' {} \; | tee >(xargs sed -i -r '1,10 s/([ \t#*]*)(.*Copyright.*Nokia.*)/ \1Copyright \(C\) 2013 Digia Plc and\/or its subsidiary\(-ies\)\./I') >(xargs sed -i -r '1,10 s/(^[ \t#*]*)(all rights reserved.*)/\1/I') This excludes binary files and retains whitespace and #* characters in the beginning of the edited lines. Change-Id: Ied5eec778f0884c55c656575544d8ea54c38c716 Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Fixed licensesTeemu Kaukoranta2013-05-2362-1372/+1372
| | | | | | | | | Updated licenses using replace-licenses.zsh from mkdist repo. Possible copyright and contact changes will come later. Change-Id: Ib44456d2dce2f9104ebf526894015a965dbe91a9 Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Add msaa option to use multisampling instead of normal antialiasingGunnar Sletta2013-05-233-1/+59
| | | | | Change-Id: Ie4b17b971fe83daf5eaa5ceb1741710e0c27aa33 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Fix batching bug.Michael Brasser2013-05-151-3/+3
| | | | | | | | | | | | | | There was an error in the following example situation: 1. We have a batch with 3 elements 2. element 1 is added to the batch 3. element 2 has an overlap, and is *not* added to the batch 4. element 3 and element 2 overlap, but element 3 is still added to the batch 5. element 2 is added to a later batch by itself, and incorrectly appears on top of element 3 Change-Id: I103c1a4ca2666514993bd79eb2c5cbd54f4acb5d Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Make it possible to force disable distancefields textGunnar Sletta2013-05-133-0/+29
| | | | | | | | This requires that the symbol is exported from declarative but on embedded that is usually not needed. Change-Id: Ie73bb67c569a70f2252dd8ca1e8de1baa0f1bab6 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Disable swap anim driver time warningGunnar Sletta2013-05-021-5/+3
| | | | | Change-Id: Idaaf4b402dd618c861e2cf48f1e6f31600d45297 Reviewed-by: aavit <eirik.aavitsland@digia.com>
* Create m_clipProgram in correct thread.Michael Brasser2013-04-172-7/+14
| | | | | Change-Id: I46b542ba64ab74b75bce014acc2a941d84fd95d4 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Enable preloading/sharing of the overlap renderer's clip program.Michael Brasser2013-04-124-23/+40
| | | | | | | | This allows the cost to be payed once at startup, rather than on the first frame of each renderer. Change-Id: Ibcd0e2a3f15bf121ba139a7ac19b0df490116b0c Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Introduce CustomContext_USE_BGRA_FALLBACK.Michael Brasser2013-04-112-7/+10
| | | | | | | | On some hardware this performs better than the default uploadBGRA path. Change-Id: Iccef6b7c563caffb6efb1fed3a50adbc31bf16bf Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* AtlasTexture improvementsMichael Brasser2013-04-113-28/+34
| | | | | | | | | | | Rename small/large atlas to primary/secondary atlas. This makes it more intuitive in the case of the primary atlas being the same size or larger than the secondary one. Allow the primary atlas to be preloaded. Change-Id: I6acb466c9c351558b7ecc49cdbc76af36802ad69 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Minor cleanup: remove unused code.Michael Brasser2013-04-112-5/+0
| | | | | Change-Id: I362703f1357da9db98d4af3ba166fe856eebfd11 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Allow nonpreservedrtexture and atlastexture to be used together.Michael Brasser2013-04-025-10/+24
| | | | | | | Small images will be atlased; large ones will not be preserved. Change-Id: Ia521e849e22068fef42ad3d0db7f57c22953818a Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Introduce 'nonpreservedtexture'Michael Brasser2013-04-025-0/+91
| | | | | | | | | | | | Provide a texture factory that does not keep a reference to the QImage. This is intended to lower memory usage in the case of an embedded system with only a single window that is never hidden or re-exposed. See also 8b50a9f00f6f5b693d18c59ff15968e2b902ebf8 in qtdeclarative. Change-Id: If0a11f6bb37f4fb3b409a577609ebdfce73789b2 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 05:22:17 +0000