Fixes: QDS-2258
Pick-to: 5.15
Change-Id: Ifafe45ec0442c3c9125c9de891b809cc8998f113
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>

Change-Id: Id618d64a2ffdc5c6d2e9cb781defe790ecc600ba
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>

Change-Id: I51a9fab09a05b25ba1c4593ee2b189adebc41c89
Reviewed-by: Christian Strømme <christian.stromme@qt.io>

Change-Id: I91ed112c17a995494ec4c4fc49d45a180974af91
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>

Change-Id: I2e653809e31d971560992ff066e7430ba94465a0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>

Change-Id: Ibbc257271097dffc0a9ab0c5a04e397636967f66
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>

Andy Nichols authored 4 years ago and Andy Nichols committed 4 years ago

This changes how 2D Qt Quick items are rendered inside a 3D scene.
Instead of creating an offscreen surface, a new Qt Quick 2D renderer
is created to renderer the 2D content in the same pass as the
3D content.

There are some behavior changes when 2D Items are used in this manner.
Instead of generating a Quad mesh that is centred on the Node's origin,
2D Items will now be placed with their top-left corner in the node's
origin. To recreate the previous behavior use: anchors.centerIn: parent

There is also a hidden "contentItem" now that is created when 2D items
are added as children of a Node. All of this should make for a more
smooth experience embedding 2D content in 3D.

Change-Id: I9060a291c2652818da7742249f9e0255a1b34356
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>

The check was missed in e2c98adf and is needed to correctly select
the right variable name.

Change-Id: Ib0cbb404471b1a27c329910f2b18431b3bb1db94
Reviewed-by: Inho Lee <inho.lee@qt.io>
Reviewed-by: Christian Strømme <christian.stromme@qt.io>

Change-Id: I4e9c298b8cd080007dbe5ecffa8ae8c1c6abab70
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>

Pick-to: 5.15
Change-Id: I312d70ed048e0661faabc6a17a00b1e478bf8dff
Reviewed-by: Christian Strømme <christian.stromme@qt.io>

Change-Id: I4bc209331611b245c2dabe6d33fb646ea01b39bc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>

Don't force the template arguments, let it deduce them.

Change-Id: Ifec7faf1edb04e04fec4ca5994f1a3c33a5a7e98
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

Change-Id: I2687b56d121d2183653b1585bef2ab97fa34ba78
Reviewed-by: Christian Strømme <christian.stromme@qt.io>
Reviewed-by: Andy Nichols <andy.nichols@qt.io>

manger -> manager

Change-Id: I0e65c3608ae76e160f3f265211718d57505de1c3
Reviewed-by: Inho Lee <inho.lee@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>

We might want to re-use or re-create this class elsewhere, so move
the declaration a place where we can access it. It also makes sense that
the vertex implementation is in the qssgvertexpipelineimpl file and the
render bits in qssgrenderer.

Change-Id: I565b39e732aff48195cbac2687843ba22709db1c
Reviewed-by: Andy Nichols <andy.nichols@qt.io>

We want this code to be self contained as much as possible, as we want
to decouple it from the to the point where it's usable out side the
engine itself. With this change there's no longer a relationship
between the custom material generator and the "default" generator.
The generator itself also contains no state, which should make it
easier to interface with. While most of the state the generator
kept was complete nonsense, there was some caching mechanisms to speed
up uniform name look-ups  etc., those problems have been taken into
consideration (should hopefully be even faster). The generated
sampler names are also now more sensibly named now (based on the type).

While the generator now is less coupled with the rest of the engine,
further work is needed to decouple the pipeline and its sub-components
to make the whole infrastructure usable outside the engine.

Task-number: QTBUG-84770
Change-Id: I3b364c02ff0729ab45a835df8b39601f65f24a35
Reviewed-by: Andy Nichols <andy.nichols@qt.io>

... from outside a QQuick3DObject. This is convenient for usage in
tests or in other cases where we need to force the creation of the
render node.

Change-Id: Ib22caff04657066144c60b81162df9436d5111a5
Reviewed-by: Andy Nichols <andy.nichols@qt.io>

We don't use this handle, as it's already provided elsewhere.

Change-Id: I8c382bee9f72eb5bdf1da2ffbed0f9910528bcbd
Reviewed-by: Andy Nichols <andy.nichols@qt.io>

This state was stored in the shader generator, but storing it in the
QSSGRenderableImage class gives us more flexibility, as there's no need
to keep a separate table to track each image or adjust it to match the
different types we at any time support. The image type enum was also
moved into QSSGRenderableImage's scope, for clarity, and the size was
change to not affect the size of QSSGRenderableImage. Note that the
state of the uvcoords generation is naturally reset on each frame.

Change-Id: Ie4d34dc7901063c48ebf0686bcf77ba83c866778
Reviewed-by: Andy Nichols <andy.nichols@qt.io>

This is the first step in making the generators more self-contained

Change-Id: Ie339967c436adad60b8ea7a00b654c08a1de77ac
Reviewed-by: Andy Nichols <andy.nichols@qt.io>

default material and principle material should support
the vertex color attribue.

Task-number: QTBUG-78841
Change-Id: Ib08f0cfd2052f8ffc2a3381852abff24b9785c3a
Reviewed-by: Christian Strømme <christian.stromme@qt.io>

Mårten Nordheim authored 4 years ago and Mårten Nordheim committed 4 years ago

Task-number: QTBUG-84319
Change-Id: Ied5cb5b11f790bead87dd383d19b2d61ae78e780
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

Change-Id: I0bb60aa24a6417c7a5115fecae0dad8ab0fc0a69
Reviewed-by: Andy Nichols <andy.nichols@qt.io>

... to QSSGDefaultMaterialPreparationResult.

Change-Id: I9c413cb0bb70ecbce46715ef9cf7194f21450edf
Reviewed-by: Andy Nichols <andy.nichols@qt.io>

These were missed when the signature for the hashing functions were
update.

Change-Id: Ia0755d11acd8204763eb6d76014da60db7b5b7db
Reviewed-by: Andy Nichols <andy.nichols@qt.io>

Change-Id: I60b6aab4d34d606dfafe8db22ec92a492b6aeb96
Reviewed-by: Andy Nichols <andy.nichols@qt.io>

Change-Id: I6fa3318e3dc9a1e6cc85e99b2abaa6ffb750b290
Reviewed-by: Andy Nichols <andy.nichols@qt.io>

Change-Id: I7476f9c24ac6e32a0123beb33e1604192447afbc
Reviewed-by: Andy Nichols <andy.nichols@qt.io>

Change-Id: I0665129869e4ce6b89d2c0987313efb378726a81
Reviewed-by: Andy Nichols <andy.nichols@qt.io>

code that was missed in the tesselation purge in 309702fd05e

Change-Id: Ic5314adc5d951aab7bea6e79bb9f3c97c3e6f97b
Reviewed-by: Andy Nichols <andy.nichols@qt.io>

Change-Id: I77b902a038a24f7404a62220357fc41900729a5f
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>

Since we are looking at few elements, it is quicker doing a linear
search than creating a hash map.

Task-number: QTBUG-83706
Change-Id: Id452a39f7ba2ae05ea1c04233fb70b73053bebe4
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>

Task-number: QTBUG-83706
Change-Id: I78e2c2bda9b4bb443cc06856ee3118a4a4baf964
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>

This, like the original code, suffers from not being compatible when the
QQuickWindow has its rendering redirected in combination with
QQuickRenderControl (there is no swapchain in that case).

However, the solution to that lies along what's shown here, the
QSGRendererInterface will eventually expose more resources. For now
as a first step let's just decouple from QQuickWindowPrivate.

Change-Id: Ib3239d7a96217201ac0ce08fa24c8bc03c725a9b
Reviewed-by: Andy Nichols <andy.nichols@qt.io>

Change-Id: I46436fcad29e34f8277b225dd6bc3d6db88acde9
Reviewed-by: Andy Nichols <andy.nichols@qt.io>

Change-Id: I7f94b31cd6b76c696a34dfe8150a75b21ee8d9ed
Reviewed-by: Jonas Karlsson <jonas.karlsson@qt.io>
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>

Related to db8e3c06

Change-Id: I327e2cb4929b07604e74a679c8c0c206dc5078b1
Reviewed-by: Inho Lee <inho.lee@qt.io>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>

It's a prototype and many implementations are not proper yet.

Task-number: QTBUG-83173
Change-Id: Ifbc5ff7f089582a0da7a950e0b97b48d3b8ad502
Reviewed-by: Andy Nichols <andy.nichols@qt.io>

Follow up on 1b33ee95e5c6e5e27f732fd273920861fdae486a in qtbase.

Change-Id: Ic8625a2106ba52aa32eb0d75f03b436836eae695
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>

Change-Id: Iedad3cf35597d4213d7a04a2d552089b359e8982
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>