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

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

Since 05202183 the QSSGShaderFeatures have been optimized to be stored
as unique 4byte key, meaning we avoided expensive hashing. But the
QSSGShaderMapKey was not using it as such, which meant we were not
getting any benefits of the optimization and since the address of the
feature set was used, there was close to a zero percent chance to
reusing shaders with the same properties and features.

Change-Id: Ief5d0a6efeb1dc0ca3a38b6132a9777d38facd19
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
(cherry picked from commit ea5d8580)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

This amends 1bca206a which failed to note that the QSSGRenderCameraData
was uploaded in full, assuming that it wouldn't contain anything else
then the direction of the camera.

Change-Id: Ie8ec06d3fe4635b5c9b85a0b1b71b980fde9eca0
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
(cherry picked from commit 079edb60)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

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

We need to export the type as a value type, and also export its enums
in a namespace. This resulted in duplicated entries in the qmltypes
file, which confuses Qt Design Studio.

Fix it by introducing a derived class, and using it for exporting the
enums.

Fixes: QTBUG-115362
Change-Id: I7a052592961fcbcecb8b48757a9babaa79d81f77
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit 17d9ce3f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

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

It's the default value anyway, but write it out like the EXR loader
does, for clarity.

Change-Id: Iabefe713661fff6f8dbfc286b94bef17fff83d59
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
(cherry picked from commit 7cad380c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

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

Since QtQuick3D's renderer paths will always be via QQuickWindow, we
should always use QQuickWindow::effectiveDevicePixelRatio() instead of
QWindow::devicePixelRatio() because effectiveDevicePixelRatio() will
take into consideration the RenderControl case where there is an dummy
Window that may not reflect the physical screen. If you use juse use
QWindow::devicePixelRatio() and the fake window can't provide a DPR then
it will get pulled from via QScreen which likely is not what you would
want when rendering offscreen via RenderControl.

Change-Id: Id2398d3fb32a677fb49342173ed0e44d248cf1f2
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
(cherry picked from commit 06eb7c7f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

Wherever default values are specified, it also makes sense to specify
the unit.

Fixes: QTBUG-113984
Change-Id: I53ce41c3798bca5dfdcdabd9737597458aee68ad
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
(cherry picked from commit 544bd519)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

Change-Id: I751a713176fd091e0c95e787437dcb5f746fe0f9
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
(cherry picked from commit 82057bcc)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

The debug drawing is now it's own pass, which will be enabled if used.
As before, enabling the debug draw system is a manual process and the
internal modes (LOD related), still needs to be enabled manually in
code.

Change-Id: If9dfa542acb72827b189ed66b6964df4d93c30f0
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
(cherry picked from commit d4c2ba4a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

Follow the pattern used elsewhere. Also, the implementation for this was
already in the layer data, which it will live for now.

Change-Id: Ifad25cbe9c1dbbf5c4d65b5a3b10db1e0bfc4921
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
(cherry picked from commit 5c28838b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

Part of the effort to improve the API of some of our internal class'.
This means we don't need to expose the specific material types, this is
the callers responsibility to check. All our graph objects have type
info.

Change-Id: I1fe13962920a827e4be7c6d4842d7d36b6bb6fcd
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
(cherry picked from commit 977a42e7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

When using CustomMaterial, a vertex color attribue was enabled
only if the VAR_COLOR varing is used.
If the mesh has the attribue, it will be enabled.

Fixes: QTBUG-115522
Change-Id: If682c40b7e71baffa0e75be4bdd8e26cdcc9ea6f
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
(cherry picked from commit b4088ed7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

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

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

Exclude TUs that cause problems in a build where all of the library's
.cpp files end up in a single unity_0_cxx.cxx. This should ensure that
the build will forthwith not fail because someone added a new .cpp
file in the "wrong" position.

Of course, this is just a snapshot, with my configuration: Clang 15,
Ubuntu 20.04, -developer-build, C++23, -sctp, libc++, ...

Task-number: QTBUG-115450
Change-Id: I6165bea6402010c79fd9fd7ad8a935c35fdd27a7
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 0dcf4db3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

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

Added \examplecategory to all the examples
so that they can be grouped accordingly in the
documentation.

Task-number: QTBUG-115323
Change-Id: I558d774c59206363e7fd26a7e21370a914c7bf70
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
(cherry picked from commit 85659e9e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

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

Change-Id: If6e5d7854aecc7551cb6ed92ca16de86fe97d66f
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
(cherry picked from commit d7bdf496)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

Change-Id: I9d9ae02734eb351a5e36baca940819bad5eeb649
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
(cherry picked from commit 0e9a47cc)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

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

When building both qtquick3d and qt3d in a top-level build, both of
them try to find the assimp 3rd party library via their own Find
scripts.
The assimp library depends on the draco library.

On Ubuntu the draco package exports two targets, draco_shared and
draco_static, but the assimp library only depends on draco_shared.
I mention Ubuntu, because they patch the Config file for the package.

qt_find_package promotes all 3rd party library targets to global
and that also happens for Quick3D -> assimp -> draco_shared.
Notably draco_static is left unpromoted.

Then when qt3d calls find_package(*Assimp), the draco-targets.cmake
file is loaded and checks for the existence of its targets.
It finds draco_shared, because it is global, but not draco_static
and errors out with:

CMake Error at
/usr/lib/x86_64-linux-gnu/cmake/draco/draco-targets.cmake:37 (message):
 Some (but not all) targets in this export set were already defined.
  Targets Defined: draco_shared
  Targets not yet defined: draco_static

To prevent the error, manually promote the targets to global if they
exist only during the qt build.

Fixes: QTBUG-106371
Fixes: QTBUG-115064
Change-Id: I7bab736f21a8fc740d2df184daa4ecce03965160
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
(cherry picked from commit 94cc48a0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

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

After de9e978532ef5a3 in QtBase the test value used in some of our tests
are too small to trigge a difference, since QQuaternion now will do
normalization even if the length is roughly 1.

Fixes: QTBUG-114557
Task-number: QTBUG-114313
Task-number: QTBUG-105918
Change-Id: I4e95d44c4b3a3e492bbf37506f9259b66b1d9918
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
(cherry picked from commit 06b5d1d3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

Found by the static analyzer.

Change-Id: If8a94f34f1840764100e0c588a82cf83290a1575
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
(cherry picked from commit acd2c4c4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

Mesh nodes does not get a runtime object, which means there's at least
one case where the node's object will be a null pointer.

Change-Id: I3ee35f348ccabd8d6670aa511497992426876bda
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
(cherry picked from commit af03d920)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

After 030cccd2, the skeleton data array's size was not
compatible with the corresponding texture.

Fixes: QTBUG-114579
Change-Id: I8a6a52ac8013f2ca9c1390d03238962467c1ecb9
Reviewed-by: Christian Strømme <christian.stromme@qt.io>
(cherry picked from commit 1d187394)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

These have not been used, as the comment suggest, for a very long time.

Change-Id: I89392787d7706d30e2b597c3aa174f41166c83bf
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
(cherry picked from commit 05c725ed)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

Change-Id: Ifd471fcb442a0cb29f27960926630d298460109c
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
(cherry picked from commit 4d066e99)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

Change-Id: I5f5176b831444fc2f6225a5371519baa21974ed6
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
(cherry picked from commit 8dedbc0f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

Change-Id: I684dbb4c433dfa9389eae03afc10efe1f6f5da25
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
(cherry picked from commit 0e6b4d4d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

Fixes: QTBUG-114550
Change-Id: Iaaabdfd97574dba1ab8f79e80a0d4812eebe78c2
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
(cherry picked from commit 5f1a416f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

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

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

Change-Id: Ia0ed45ab18c3d7200255fef395b6247fe1e49ecb
Reviewed-by: Jonas Karlsson <jonas.karlsson@qt.io>
(cherry picked from commit 0b901596)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

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