From 91d4985e7b597457d024e67c64fe136c550c23fd Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 22 Nov 2017 15:32:43 +0100 Subject: Fix includes of Qt classes The convention should be used. Among other things, this makes generating Python bindings possible. Task-number: PYSIDE-487 Change-Id: I32f114377dd70d27dee71a44b05c81474eb5dac3 Reviewed-by: Andy Nichols --- src/extras/3dtext/qextrudedtextgeometry.h | 4 ++-- src/extras/3dtext/qextrudedtextmesh.h | 4 ++-- src/extras/defaults/qmorphphongmaterial.h | 2 +- src/extras/defaults/qtexturematerial.h | 2 +- src/render/framegraph/qbuffercapture.h | 2 +- src/render/framegraph/qclearbuffers.h | 4 ++-- src/render/framegraph/qframegraphnode.h | 2 +- src/render/framegraph/qlayerfilter.h | 2 +- src/render/framegraph/qrendercapture.h | 2 +- src/render/framegraph/qrenderpassfilter.h | 2 +- src/render/framegraph/qviewport.h | 4 ++-- src/render/frontend/qcamera.h | 6 +++--- src/render/frontend/qcameralens.h | 6 +++--- src/render/frontend/qlayer.h | 2 +- src/render/frontend/qlevelofdetail.h | 2 +- src/render/frontend/qlevelofdetailboundingsphere.h | 2 +- src/render/geometry/qbuffer.h | 2 +- src/render/geometry/qbufferdatagenerator.h | 2 +- src/render/geometry/qgeometryfactory.h | 2 +- src/render/geometry/qmesh.h | 2 +- src/render/io/qsceneloader.h | 2 +- src/render/lights/qabstractlight.h | 4 ++-- src/render/materialsystem/qfilterkey.h | 2 +- src/render/materialsystem/qgraphicsapifilter.h | 6 +++--- src/render/materialsystem/qmaterial.h | 2 +- src/render/materialsystem/qparameter.h | 2 +- src/render/materialsystem/qrenderpass.h | 2 +- src/render/materialsystem/qshaderdata.h | 2 +- src/render/materialsystem/qtechnique.h | 4 ++-- src/render/picking/qpickevent.h | 6 +++--- src/render/renderstates/qstenciloperationarguments.h | 2 +- src/render/renderstates/qstenciltestarguments.h | 2 +- src/render/texture/qtexturegenerator.h | 2 +- src/render/texture/qtextureimage.h | 2 +- src/render/texture/qtextureimagedatagenerator.h | 2 +- src/render/texture/qtexturewrapmode.h | 2 +- 36 files changed, 50 insertions(+), 50 deletions(-) diff --git a/src/extras/3dtext/qextrudedtextgeometry.h b/src/extras/3dtext/qextrudedtextgeometry.h index 9ee8b23f0..d6e682dbd 100644 --- a/src/extras/3dtext/qextrudedtextgeometry.h +++ b/src/extras/3dtext/qextrudedtextgeometry.h @@ -53,8 +53,8 @@ #include #include -#include -#include +#include +#include QT_BEGIN_NAMESPACE diff --git a/src/extras/3dtext/qextrudedtextmesh.h b/src/extras/3dtext/qextrudedtextmesh.h index 3f2f41a37..ea3054003 100644 --- a/src/extras/3dtext/qextrudedtextmesh.h +++ b/src/extras/3dtext/qextrudedtextmesh.h @@ -53,8 +53,8 @@ #include #include -#include -#include +#include +#include QT_BEGIN_NAMESPACE diff --git a/src/extras/defaults/qmorphphongmaterial.h b/src/extras/defaults/qmorphphongmaterial.h index 3b65088b1..235426f1c 100644 --- a/src/extras/defaults/qmorphphongmaterial.h +++ b/src/extras/defaults/qmorphphongmaterial.h @@ -39,7 +39,7 @@ #include #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/extras/defaults/qtexturematerial.h b/src/extras/defaults/qtexturematerial.h index 3101b9a1b..ec3eba392 100644 --- a/src/extras/defaults/qtexturematerial.h +++ b/src/extras/defaults/qtexturematerial.h @@ -42,7 +42,7 @@ #include #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/qbuffercapture.h b/src/render/framegraph/qbuffercapture.h index d77266828..ab8c7d2c2 100644 --- a/src/render/framegraph/qbuffercapture.h +++ b/src/render/framegraph/qbuffercapture.h @@ -42,7 +42,7 @@ #include #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/qclearbuffers.h b/src/render/framegraph/qclearbuffers.h index 91828c222..138e49450 100644 --- a/src/render/framegraph/qclearbuffers.h +++ b/src/render/framegraph/qclearbuffers.h @@ -42,8 +42,8 @@ #include #include -#include -#include +#include +#include QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/qframegraphnode.h b/src/render/framegraph/qframegraphnode.h index eb43708e1..b9ff6bbfb 100644 --- a/src/render/framegraph/qframegraphnode.h +++ b/src/render/framegraph/qframegraphnode.h @@ -42,7 +42,7 @@ #include #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/qlayerfilter.h b/src/render/framegraph/qlayerfilter.h index 61eac5773..886c7c47a 100644 --- a/src/render/framegraph/qlayerfilter.h +++ b/src/render/framegraph/qlayerfilter.h @@ -41,7 +41,7 @@ #define QT3DRENDER_QLAYERFILTER_H #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/qrendercapture.h b/src/render/framegraph/qrendercapture.h index 5b768b593..e8f549bd1 100644 --- a/src/render/framegraph/qrendercapture.h +++ b/src/render/framegraph/qrendercapture.h @@ -38,7 +38,7 @@ #define QRENDERCAPTURE_H #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/qrenderpassfilter.h b/src/render/framegraph/qrenderpassfilter.h index 934d0479b..c5b5d872e 100644 --- a/src/render/framegraph/qrenderpassfilter.h +++ b/src/render/framegraph/qrenderpassfilter.h @@ -42,7 +42,7 @@ #include #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/render/framegraph/qviewport.h b/src/render/framegraph/qviewport.h index 66a3428c5..fabd15174 100644 --- a/src/render/framegraph/qviewport.h +++ b/src/render/framegraph/qviewport.h @@ -41,8 +41,8 @@ #define QT3DRENDER_QVIEWPORT_H #include -#include -#include +#include +#include QT_BEGIN_NAMESPACE diff --git a/src/render/frontend/qcamera.h b/src/render/frontend/qcamera.h index dd7c63778..c41159d85 100644 --- a/src/render/frontend/qcamera.h +++ b/src/render/frontend/qcamera.h @@ -43,9 +43,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include QT_BEGIN_NAMESPACE diff --git a/src/render/frontend/qcameralens.h b/src/render/frontend/qcameralens.h index fdb0d5868..800928c75 100644 --- a/src/render/frontend/qcameralens.h +++ b/src/render/frontend/qcameralens.h @@ -43,9 +43,9 @@ #include #include -#include -#include -#include +#include +#include +#include QT_BEGIN_NAMESPACE diff --git a/src/render/frontend/qlayer.h b/src/render/frontend/qlayer.h index f44685d7e..e1e44289c 100644 --- a/src/render/frontend/qlayer.h +++ b/src/render/frontend/qlayer.h @@ -42,7 +42,7 @@ #include #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/render/frontend/qlevelofdetail.h b/src/render/frontend/qlevelofdetail.h index 2e752d962..203885a9f 100644 --- a/src/render/frontend/qlevelofdetail.h +++ b/src/render/frontend/qlevelofdetail.h @@ -44,7 +44,7 @@ #include #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/render/frontend/qlevelofdetailboundingsphere.h b/src/render/frontend/qlevelofdetailboundingsphere.h index b35df95e8..43ba422a8 100644 --- a/src/render/frontend/qlevelofdetailboundingsphere.h +++ b/src/render/frontend/qlevelofdetailboundingsphere.h @@ -43,7 +43,7 @@ #include #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/render/geometry/qbuffer.h b/src/render/geometry/qbuffer.h index 7cb5acb0a..c91f4038a 100644 --- a/src/render/geometry/qbuffer.h +++ b/src/render/geometry/qbuffer.h @@ -42,7 +42,7 @@ #include #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/render/geometry/qbufferdatagenerator.h b/src/render/geometry/qbufferdatagenerator.h index 702f396d4..004eb26eb 100644 --- a/src/render/geometry/qbufferdatagenerator.h +++ b/src/render/geometry/qbufferdatagenerator.h @@ -42,7 +42,7 @@ #include #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/render/geometry/qgeometryfactory.h b/src/render/geometry/qgeometryfactory.h index d5d88a45d..2e4d5c821 100644 --- a/src/render/geometry/qgeometryfactory.h +++ b/src/render/geometry/qgeometryfactory.h @@ -42,7 +42,7 @@ #include #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/render/geometry/qmesh.h b/src/render/geometry/qmesh.h index fab76a249..51fdab63a 100644 --- a/src/render/geometry/qmesh.h +++ b/src/render/geometry/qmesh.h @@ -42,7 +42,7 @@ #include #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/render/io/qsceneloader.h b/src/render/io/qsceneloader.h index 31ec47ac0..2790bcccb 100644 --- a/src/render/io/qsceneloader.h +++ b/src/render/io/qsceneloader.h @@ -43,7 +43,7 @@ #include #include #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/render/lights/qabstractlight.h b/src/render/lights/qabstractlight.h index 33a88b215..24d7686fd 100644 --- a/src/render/lights/qabstractlight.h +++ b/src/render/lights/qabstractlight.h @@ -43,8 +43,8 @@ #include #include -#include -#include +#include +#include QT_BEGIN_NAMESPACE diff --git a/src/render/materialsystem/qfilterkey.h b/src/render/materialsystem/qfilterkey.h index 16db2a9e8..009447c88 100644 --- a/src/render/materialsystem/qfilterkey.h +++ b/src/render/materialsystem/qfilterkey.h @@ -42,7 +42,7 @@ #include #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/render/materialsystem/qgraphicsapifilter.h b/src/render/materialsystem/qgraphicsapifilter.h index 488d8bd4b..f1d6956b3 100644 --- a/src/render/materialsystem/qgraphicsapifilter.h +++ b/src/render/materialsystem/qgraphicsapifilter.h @@ -40,10 +40,10 @@ #ifndef QT3DRENDER_QGRAPHICSAPIFILTER_H #define QT3DRENDER_QGRAPHICSAPIFILTER_H -#include -#include +#include +#include #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/render/materialsystem/qmaterial.h b/src/render/materialsystem/qmaterial.h index e11d30e5c..aa7a9cf8d 100644 --- a/src/render/materialsystem/qmaterial.h +++ b/src/render/materialsystem/qmaterial.h @@ -40,7 +40,7 @@ #ifndef QT3DRENDER_QMATERIAL_H #define QT3DRENDER_QMATERIAL_H -#include +#include #include #include diff --git a/src/render/materialsystem/qparameter.h b/src/render/materialsystem/qparameter.h index c742b5e22..cbf30a5a8 100644 --- a/src/render/materialsystem/qparameter.h +++ b/src/render/materialsystem/qparameter.h @@ -40,7 +40,7 @@ #ifndef QT3DRENDER_QPARAMETER_H #define QT3DRENDER_QPARAMETER_H -#include +#include #include #include diff --git a/src/render/materialsystem/qrenderpass.h b/src/render/materialsystem/qrenderpass.h index 9c608d0c4..b19436e90 100644 --- a/src/render/materialsystem/qrenderpass.h +++ b/src/render/materialsystem/qrenderpass.h @@ -47,7 +47,7 @@ #include #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/render/materialsystem/qshaderdata.h b/src/render/materialsystem/qshaderdata.h index e695d1eb0..7f32e2405 100644 --- a/src/render/materialsystem/qshaderdata.h +++ b/src/render/materialsystem/qshaderdata.h @@ -42,7 +42,7 @@ #include #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/render/materialsystem/qtechnique.h b/src/render/materialsystem/qtechnique.h index cf5c034e8..6bab92a2a 100644 --- a/src/render/materialsystem/qtechnique.h +++ b/src/render/materialsystem/qtechnique.h @@ -44,8 +44,8 @@ #include #include #include -#include -#include +#include +#include QT_BEGIN_NAMESPACE diff --git a/src/render/picking/qpickevent.h b/src/render/picking/qpickevent.h index 3fbee0d30..7d854043e 100644 --- a/src/render/picking/qpickevent.h +++ b/src/render/picking/qpickevent.h @@ -40,9 +40,9 @@ #ifndef QT3DRENDER_QPICKEVENT_H #define QT3DRENDER_QPICKEVENT_H -#include -#include -#include +#include +#include +#include #include QT_BEGIN_NAMESPACE diff --git a/src/render/renderstates/qstenciloperationarguments.h b/src/render/renderstates/qstenciloperationarguments.h index db80ecc19..9705c9822 100644 --- a/src/render/renderstates/qstenciloperationarguments.h +++ b/src/render/renderstates/qstenciloperationarguments.h @@ -40,7 +40,7 @@ #ifndef QT3DRENDER_QSTENCILOPERATIONARGUMENTS_H #define QT3DRENDER_QSTENCILOPERATIONARGUMENTS_H -#include +#include #include QT_BEGIN_NAMESPACE diff --git a/src/render/renderstates/qstenciltestarguments.h b/src/render/renderstates/qstenciltestarguments.h index f20885d03..35447d477 100644 --- a/src/render/renderstates/qstenciltestarguments.h +++ b/src/render/renderstates/qstenciltestarguments.h @@ -40,7 +40,7 @@ #ifndef QT3DRENDER_QSTENCILTESTARGUMENTS_H #define QT3DRENDER_QSTENCILTESTARGUMENTS_H -#include +#include #include QT_BEGIN_NAMESPACE diff --git a/src/render/texture/qtexturegenerator.h b/src/render/texture/qtexturegenerator.h index faa9e1c7b..10f0cde57 100644 --- a/src/render/texture/qtexturegenerator.h +++ b/src/render/texture/qtexturegenerator.h @@ -43,7 +43,7 @@ #include #include #include -#include +#include QT_BEGIN_NAMESPACE diff --git a/src/render/texture/qtextureimage.h b/src/render/texture/qtextureimage.h index e2ab54a1b..9f1124ee7 100644 --- a/src/render/texture/qtextureimage.h +++ b/src/render/texture/qtextureimage.h @@ -40,7 +40,7 @@ #ifndef QT3DRENDER_QTEXTUREIMAGE_H #define QT3DRENDER_QTEXTUREIMAGE_H -#include +#include #include QT_BEGIN_NAMESPACE diff --git a/src/render/texture/qtextureimagedatagenerator.h b/src/render/texture/qtextureimagedatagenerator.h index 5213f3929..0e7e6c782 100644 --- a/src/render/texture/qtextureimagedatagenerator.h +++ b/src/render/texture/qtextureimagedatagenerator.h @@ -41,7 +41,7 @@ #define QT3DRENDER_QTEXTUREIMAGEDATAGENERATOR_H #include -#include +#include // TO DO TexImageDataPtr -> QImageDataPtr + d_ptr // We might also get rid of the layer, face, mipmap level from diff --git a/src/render/texture/qtexturewrapmode.h b/src/render/texture/qtexturewrapmode.h index 7349e654c..36af013a8 100644 --- a/src/render/texture/qtexturewrapmode.h +++ b/src/render/texture/qtexturewrapmode.h @@ -41,7 +41,7 @@ #define QT3DRENDER_QTEXTUREWRAPMODE_H #include -#include +#include QT_BEGIN_NAMESPACE -- cgit v1.2.3 From 2d59bdf71867f7b5fd6cb21e0658c9a4eaf53cf1 Mon Sep 17 00:00:00 2001 From: Christian Stromme Date: Wed, 15 Nov 2017 21:37:26 +0100 Subject: Silence -Wunused-paremeter warnings in renderview.cpp renderview.cpp:341: warning: unused parameter 'begin' [-Wunused-parameter] renderview.cpp:341: warning: unused parameter 'end' [-Wunused-parameter] Change-Id: I0ddd23543101e10108725add7094b3e2a1520dc2 Reviewed-by: Laszlo Agocs --- src/render/backend/renderview.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/render/backend/renderview.cpp b/src/render/backend/renderview.cpp index 7adf7c5d2..a2eefd911 100644 --- a/src/render/backend/renderview.cpp +++ b/src/render/backend/renderview.cpp @@ -316,6 +316,8 @@ struct SubRangeSorter { static void sortSubRange(CommandIt begin, const CommandIt end) { + Q_UNUSED(begin); + Q_UNUSED(end); Q_UNREACHABLE(); } }; -- cgit v1.2.3 From 1129ff731fca6aff5849cafe1f434f1882342cd7 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 27 Nov 2017 17:06:20 +0100 Subject: qanimationgroup.h: Fix include of Qt class Amends 91d4985e7b597457d024e67c64fe136c550c23fd. Task-number: PYSIDE-487 Change-Id: I8689241bb1899f2af9c449a7c51bfc3927d68a48 Reviewed-by: Andy Nichols --- src/animation/frontend/qanimationgroup.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/animation/frontend/qanimationgroup.h b/src/animation/frontend/qanimationgroup.h index 1e23c61ee..a4f34c815 100644 --- a/src/animation/frontend/qanimationgroup.h +++ b/src/animation/frontend/qanimationgroup.h @@ -37,7 +37,7 @@ #ifndef QT3DANIMATION_QANIMATIONGROUP_H #define QT3DANIMATION_QANIMATIONGROUP_H -#include +#include #include -- cgit v1.2.3 From 37d78994de56cd11a06ccd1a777cf0ac8ec8e801 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 12 Dec 2017 09:55:37 +0100 Subject: Bump version Change-Id: I66adb4fd64d98f73a81d3d186f6202ebcbdbe545 --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index 2108ac6fd..4f571fb57 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,3 +1,3 @@ load(qt_build_config) -MODULE_VERSION = 5.9.3 +MODULE_VERSION = 5.9.4 -- cgit v1.2.3 From c2e8b0dc4ddaaea9d20175cddea352e39f26896e Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Fri, 8 Sep 2017 12:18:26 +0200 Subject: Get rid of the INDEXBITS template argument for QHandle It's not required anymore, as the resource manager can grow as needed. Change-Id: If509de7f2ef90e1af9729d8fc60d7ecb08ede687 Reviewed-by: Svenn-Arne Dragly Reviewed-by: Sean Harmer --- src/animation/backend/handle_types_p.h | 10 +-- src/animation/backend/managers_p.h | 15 ++--- src/core/resources/qhandle_p.h | 16 ++--- src/core/resources/qresourcemanager_p.h | 50 +++++++-------- src/input/backend/handle_types_p.h | 32 +++++----- src/input/backend/inputmanagers_p.h | 48 +++++--------- src/logic/handle_types_p.h | 2 +- src/logic/managers_p.h | 3 +- src/plugins/renderplugins/scene2d/scene2dplugin.h | 1 - src/render/backend/entity_p.h | 12 ++-- src/render/backend/handle_types_p.h | 64 +++++++++---------- src/render/backend/managers_p.h | 27 -------- src/render/backend/renderview.cpp | 4 +- src/render/framegraph/renderpassfilternode_p.h | 2 +- src/render/framegraph/techniquefilternode_p.h | 2 +- src/render/geometry/buffermanager_p.h | 1 - src/render/geometry/geometryrenderermanager_p.h | 1 - src/render/io/scenemanager.cpp | 1 - src/render/io/scenemanager_p.h | 1 - src/render/jobs/pickboundingvolumejob.cpp | 4 +- src/render/jobs/pickboundingvolumeutils.cpp | 8 +-- src/render/materialsystem/techniquemanager_p.h | 1 - .../core/qresourcemanager/tst_qresourcemanager.cpp | 73 +++++++++++----------- .../tst_bench_qresourcesmanager.cpp | 12 ++-- 24 files changed, 164 insertions(+), 226 deletions(-) diff --git a/src/animation/backend/handle_types_p.h b/src/animation/backend/handle_types_p.h index f6f77eb20..fbdc5d83f 100644 --- a/src/animation/backend/handle_types_p.h +++ b/src/animation/backend/handle_types_p.h @@ -64,11 +64,11 @@ class BlendedClipAnimator; class ChannelMapping; class ChannelMapper; -typedef Qt3DCore::QHandle HAnimationClip; -typedef Qt3DCore::QHandle HClipAnimator; -typedef Qt3DCore::QHandle HBlendedClipAnimator; -typedef Qt3DCore::QHandle HChannelMapping; -typedef Qt3DCore::QHandle HChannelMapper; +typedef Qt3DCore::QHandle HAnimationClip; +typedef Qt3DCore::QHandle HClipAnimator; +typedef Qt3DCore::QHandle HBlendedClipAnimator; +typedef Qt3DCore::QHandle HChannelMapping; +typedef Qt3DCore::QHandle HChannelMapper; } // namespace Animation } // namespace Qt3DAnimation diff --git a/src/animation/backend/managers_p.h b/src/animation/backend/managers_p.h index 3c670a8d2..68d4c67ff 100644 --- a/src/animation/backend/managers_p.h +++ b/src/animation/backend/managers_p.h @@ -69,8 +69,7 @@ class ClipBlendNode; class AnimationClipLoaderManager : public Qt3DCore::QResourceManager< AnimationClip, - Qt3DCore::QNodeId, - 16> + Qt3DCore::QNodeId> { public: AnimationClipLoaderManager() {} @@ -78,8 +77,7 @@ public: class ClipAnimatorManager : public Qt3DCore::QResourceManager< ClipAnimator, - Qt3DCore::QNodeId, - 16> + Qt3DCore::QNodeId> { public: ClipAnimatorManager() {} @@ -87,8 +85,7 @@ public: class BlendedClipAnimatorManager : public Qt3DCore::QResourceManager< BlendedClipAnimator, - Qt3DCore::QNodeId, - 12> + Qt3DCore::QNodeId> { public: BlendedClipAnimatorManager() {} @@ -96,8 +93,7 @@ public: class ChannelMappingManager : public Qt3DCore::QResourceManager< ChannelMapping, - Qt3DCore::QNodeId, - 16> + Qt3DCore::QNodeId> { public: ChannelMappingManager() {} @@ -105,8 +101,7 @@ public: class ChannelMapperManager : public Qt3DCore::QResourceManager< ChannelMapper, - Qt3DCore::QNodeId, - 16> + Qt3DCore::QNodeId> { public: ChannelMapperManager() {} diff --git a/src/core/resources/qhandle_p.h b/src/core/resources/qhandle_p.h index 95483d197..46bd5f5d4 100644 --- a/src/core/resources/qhandle_p.h +++ b/src/core/resources/qhandle_p.h @@ -59,7 +59,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DCore { -template +template class QHandle { public: @@ -106,8 +106,8 @@ private: }; -template -QDebug operator<<(QDebug dbg, const QHandle &h) +template +QDebug operator<<(QDebug dbg, const QHandle &h) { QDebugStateSaver saver(dbg); QString binNumber = QString::number(h.handle(), 2).rightJustified(32, QChar::fromLatin1('0')); @@ -116,8 +116,8 @@ QDebug operator<<(QDebug dbg, const QHandle &h) return dbg; } -template -uint qHash(const QHandle &h, uint seed) +template +uint qHash(const QHandle &h, uint seed) { using QT_PREPEND_NAMESPACE(qHash); return qHash(h.handle(), seed); @@ -126,9 +126,9 @@ uint qHash(const QHandle &h, uint seed) } // Qt3DCore // simpler than fighting the Q_DECLARE_TYPEINFO macro, use QString as a dummy to get movable semantics -template -class QTypeInfo > - : public QTypeInfoMerger, QString> {}; +template +class QTypeInfo > + : public QTypeInfoMerger, QString> {}; QT_END_NAMESPACE diff --git a/src/core/resources/qresourcemanager_p.h b/src/core/resources/qresourcemanager_p.h index 8f0440498..0ed86ef21 100644 --- a/src/core/resources/qresourcemanager_p.h +++ b/src/core/resources/qresourcemanager_p.h @@ -220,24 +220,24 @@ struct Int2Type }; }; -template -class QHandleData : public QHandle::Data +template +class QHandleData : public QHandle::Data { public: T data; }; -template -inline T *QHandle::operator->() const { return (d && counter == d->counter) ? &static_cast *>(d)->data : nullptr; } -template -inline T *QHandle::data() const { return (d && counter == d->counter) ? &static_cast *>(d)->data : nullptr; } +template +inline T *QHandle::operator->() const { return (d && counter == d->counter) ? &static_cast *>(d)->data : nullptr; } +template +inline T *QHandle::data() const { return (d && counter == d->counter) ? &static_cast *>(d)->data : nullptr; } -template +template class ArrayAllocatingPolicy { public: - typedef QHandleData HandleData; - typedef QHandle Handle; + typedef QHandleData HandleData; + typedef QHandle Handle; ArrayAllocatingPolicy() { } @@ -267,7 +267,7 @@ public: typename Handle::Data *d = handle.data_ptr(); d->nextFree = freeList; freeList = d; - performCleanup(&static_cast *>(d)->data, Int2Type::needsCleanup>()); + performCleanup(&static_cast *>(d)->data, Int2Type::needsCleanup>()); } T *data(Handle h) { @@ -340,31 +340,30 @@ private: }; #ifndef QT_NO_DEBUG_STREAM -template class LockingPolicy > class QResourceManager; -template class LockingPolicy = NonLockingPolicy > -QDebug operator<<(QDebug dbg, const QResourceManager &manager); +QDebug operator<<(QDebug dbg, const QResourceManager &manager); #endif -template class LockingPolicy = NonLockingPolicy > class QResourceManager - : public ArrayAllocatingPolicy - , public LockingPolicy< QResourceManager > + : public ArrayAllocatingPolicy + , public LockingPolicy< QResourceManager > { public: - typedef ArrayAllocatingPolicy Allocator; - typedef QHandle Handle; + typedef ArrayAllocatingPolicy Allocator; + typedef QHandle Handle; QResourceManager() : - Allocator(), - m_maxSize((1 << INDEXBITS) - 1) + Allocator() { } @@ -443,24 +442,21 @@ public: Allocator::releaseResource(handle); } - int maximumSize() const { return m_maxSize; } - protected: QHash m_keyToHandleMap; - const int m_maxSize; private: - friend QDebug operator<< <>(QDebug dbg, const QResourceManager &manager); + friend QDebug operator<< <>(QDebug dbg, const QResourceManager &manager); }; #ifndef QT_NO_DEBUG_STREAM -template class LockingPolicy > -QDebug operator<<(QDebug dbg, const QResourceManager &manager) +QDebug operator<<(QDebug dbg, const QResourceManager &manager) { QDebugStateSaver saver(dbg); - dbg << "Contains" << manager.count() << "items" << "of a maximum" << manager.maximumSize() << endl; + dbg << "Contains" << manager.count() << "items" << endl; dbg << "Key to Handle Map:" << endl; const auto end = manager.m_keyToHandleMap.cend(); diff --git a/src/input/backend/handle_types_p.h b/src/input/backend/handle_types_p.h index c132fdc99..cfe4e66b4 100644 --- a/src/input/backend/handle_types_p.h +++ b/src/input/backend/handle_types_p.h @@ -75,22 +75,22 @@ class GenericDeviceBackendNode; class PhysicalDeviceProxy; class AxisAccumulator; -typedef Qt3DCore::QHandle HKeyboardDevice; -typedef Qt3DCore::QHandle HKeyboardHandler; -typedef Qt3DCore::QHandle HMouseHandler; -typedef Qt3DCore::QHandle HMouseDevice; -typedef Qt3DCore::QHandle HAxis; -typedef Qt3DCore::QHandle HAxisActionHandler; -typedef Qt3DCore::QHandle HAxisSetting; -typedef Qt3DCore::QHandle HAction; -typedef Qt3DCore::QHandle HAxisInput; -typedef Qt3DCore::QHandle HActionInput; -typedef Qt3DCore::QHandle HInputSequence; -typedef Qt3DCore::QHandle HInputChord; -typedef Qt3DCore::QHandle HLogicalDevice; -typedef Qt3DCore::QHandle HGenericDeviceBackendNode; -typedef Qt3DCore::QHandle HPhysicalDeviceProxy; -typedef Qt3DCore::QHandle HAxisAccumulator; +typedef Qt3DCore::QHandle HKeyboardDevice; +typedef Qt3DCore::QHandle HKeyboardHandler; +typedef Qt3DCore::QHandle HMouseHandler; +typedef Qt3DCore::QHandle HMouseDevice; +typedef Qt3DCore::QHandle HAxis; +typedef Qt3DCore::QHandle HAxisActionHandler; +typedef Qt3DCore::QHandle HAxisSetting; +typedef Qt3DCore::QHandle HAction; +typedef Qt3DCore::QHandle HAxisInput; +typedef Qt3DCore::QHandle HActionInput; +typedef Qt3DCore::QHandle HInputSequence; +typedef Qt3DCore::QHandle HInputChord; +typedef Qt3DCore::QHandle HLogicalDevice; +typedef Qt3DCore::QHandle HGenericDeviceBackendNode; +typedef Qt3DCore::QHandle HPhysicalDeviceProxy; +typedef Qt3DCore::QHandle HAxisAccumulator; } // namespace Input } // namespace Qt3DInput diff --git a/src/input/backend/inputmanagers_p.h b/src/input/backend/inputmanagers_p.h index 956b0ab8b..eee8b27d3 100644 --- a/src/input/backend/inputmanagers_p.h +++ b/src/input/backend/inputmanagers_p.h @@ -79,8 +79,7 @@ namespace Input { class KeyboardInputManager : public Qt3DCore::QResourceManager< KeyboardHandler, - Qt3DCore::QNodeId, - 16> + Qt3DCore::QNodeId> { public: KeyboardInputManager() {} @@ -88,8 +87,7 @@ public: class KeyboardDeviceManager : public Qt3DCore::QResourceManager< KeyboardDevice, - Qt3DCore::QNodeId, - 8> + Qt3DCore::QNodeId> { public: KeyboardDeviceManager() {} @@ -97,8 +95,7 @@ public: class MouseDeviceManager : public Qt3DCore::QResourceManager< MouseDevice, - Qt3DCore::QNodeId, - 8> + Qt3DCore::QNodeId> { public: MouseDeviceManager() {} @@ -106,8 +103,7 @@ public: class MouseInputManager : public Qt3DCore::QResourceManager< MouseHandler, - Qt3DCore::QNodeId, - 16> + Qt3DCore::QNodeId> { public: MouseInputManager() {} @@ -115,8 +111,7 @@ public: class AxisManager : public Qt3DCore::QResourceManager< Axis, - Qt3DCore::QNodeId, - 16> + Qt3DCore::QNodeId> { public: AxisManager() {} @@ -124,8 +119,7 @@ public: class AxisSettingManager : public Qt3DCore::QResourceManager< AxisSetting, - Qt3DCore::QNodeId, - 16> + Qt3DCore::QNodeId> { public: AxisSettingManager() {} @@ -133,8 +127,7 @@ public: class ActionManager : public Qt3DCore::QResourceManager< Action, - Qt3DCore::QNodeId, - 16> + Qt3DCore::QNodeId> { public: ActionManager() {} @@ -142,8 +135,7 @@ public: class ActionInputManager : public Qt3DCore::QResourceManager< ActionInput, - Qt3DCore::QNodeId, - 16> + Qt3DCore::QNodeId> { public: ActionInputManager() {} @@ -151,8 +143,7 @@ public: class AnalogAxisInputManager : public Qt3DCore::QResourceManager< AnalogAxisInput, - Qt3DCore::QNodeId, - 16> + Qt3DCore::QNodeId> { public: AnalogAxisInputManager() {} @@ -160,8 +151,7 @@ public: class ButtonAxisInputManager : public Qt3DCore::QResourceManager< ButtonAxisInput, - Qt3DCore::QNodeId, - 16> + Qt3DCore::QNodeId> { public: ButtonAxisInputManager() {} @@ -169,8 +159,7 @@ public: class InputChordManager : public Qt3DCore::QResourceManager< InputChord, - Qt3DCore::QNodeId, - 16> + Qt3DCore::QNodeId> { public: InputChordManager() {} @@ -178,8 +167,7 @@ public: class InputSequenceManager : public Qt3DCore::QResourceManager< InputSequence, - Qt3DCore::QNodeId, - 16> + Qt3DCore::QNodeId> { public: InputSequenceManager() {} @@ -187,8 +175,7 @@ public: class LogicalDeviceManager : public Qt3DCore::QResourceManager< LogicalDevice, - Qt3DCore::QNodeId, - 16> + Qt3DCore::QNodeId> { public: LogicalDeviceManager() {} @@ -203,8 +190,7 @@ private: class GenericDeviceBackendNodeManager : public Qt3DCore::QResourceManager< GenericDeviceBackendNode, - Qt3DCore::QNodeId, - 8> + Qt3DCore::QNodeId> { public: GenericDeviceBackendNodeManager() {} @@ -212,8 +198,7 @@ public: class Q_AUTOTEST_EXPORT PhysicalDeviceProxyManager : public Qt3DCore::QResourceManager< PhysicalDeviceProxy, - Qt3DCore::QNodeId, - 16> + Qt3DCore::QNodeId> { public: PhysicalDeviceProxyManager() {} @@ -227,8 +212,7 @@ private: class AxisAccumulatorManager : public Qt3DCore::QResourceManager< AxisAccumulator, - Qt3DCore::QNodeId, - 16> + Qt3DCore::QNodeId> { public: AxisAccumulatorManager() {} diff --git a/src/logic/handle_types_p.h b/src/logic/handle_types_p.h index d137a4047..106241e2c 100644 --- a/src/logic/handle_types_p.h +++ b/src/logic/handle_types_p.h @@ -59,7 +59,7 @@ namespace Qt3DLogic { namespace Logic { class Handler; -typedef Qt3DCore::QHandle HHandler; +typedef Qt3DCore::QHandle HHandler; } // namespace Logic } // namespace Qt3DLogic diff --git a/src/logic/managers_p.h b/src/logic/managers_p.h index 3d48aab24..17c230d28 100644 --- a/src/logic/managers_p.h +++ b/src/logic/managers_p.h @@ -64,8 +64,7 @@ namespace Logic { class HandlerManager : public Qt3DCore::QResourceManager< Handler, - Qt3DCore::QNodeId, - 16> + Qt3DCore::QNodeId> { public: HandlerManager() {} diff --git a/src/plugins/renderplugins/scene2d/scene2dplugin.h b/src/plugins/renderplugins/scene2d/scene2dplugin.h index 3b4471d55..5f39615af 100644 --- a/src/plugins/renderplugins/scene2d/scene2dplugin.h +++ b/src/plugins/renderplugins/scene2d/scene2dplugin.h @@ -67,7 +67,6 @@ class Scene2DNode; class Scene2DNodeManager : public Qt3DCore::QResourceManager< Render::Quick::Scene2D, Qt3DCore::QNodeId, - 16, Qt3DCore::ObjectLevelLockingPolicy> { }; diff --git a/src/render/backend/entity_p.h b/src/render/backend/entity_p.h index 4619314ad..8bb65280a 100644 --- a/src/render/backend/entity_p.h +++ b/src/render/backend/entity_p.h @@ -120,16 +120,16 @@ public: void setTreeEnabled(bool enabled) { m_treeEnabled = enabled; } bool isTreeEnabled() const { return m_treeEnabled; } - template - Qt3DCore::QHandle componentHandle() const + template + Qt3DCore::QHandle componentHandle() const { - return Qt3DCore::QHandle(); + return Qt3DCore::QHandle(); } - template - QVector > componentsHandle() const + template + QVector > componentsHandle() const { - return QVector >(); + return QVector >(); } template diff --git a/src/render/backend/handle_types_p.h b/src/render/backend/handle_types_p.h index 352519e75..9e3d6d522 100644 --- a/src/render/backend/handle_types_p.h +++ b/src/render/backend/handle_types_p.h @@ -95,38 +95,38 @@ class ComputeCommand; class GLBuffer; class RenderStateNode; -typedef Qt3DCore::QHandle HAttachment; -typedef Qt3DCore::QHandle HCamera; -typedef Qt3DCore::QHandle HFilterKey; -typedef Qt3DCore::QHandle HEffect; -typedef Qt3DCore::QHandle HEntity; -typedef Qt3DCore::QHandle HFrameGraphNode; -typedef Qt3DCore::QHandle HLayer; -typedef Qt3DCore::QHandle HLevelOfDetail; -typedef Qt3DCore::QHandle HMaterial; -typedef Qt3DCore::QHandle HMatrix; -typedef Qt3DCore::QHandle HVao; -typedef Qt3DCore::QHandle HShader; -typedef Qt3DCore::QHandle HTechnique; -typedef Qt3DCore::QHandle HTexture; -typedef Qt3DCore::QHandle HTransform; -typedef Qt3DCore::QHandle HTarget; -typedef Qt3DCore::QHandle HRenderPass; -typedef Qt3DCore::QHandle HTextureData; -typedef Qt3DCore::QHandle HParameter; -typedef Qt3DCore::QHandle HShaderData; -typedef Qt3DCore::QHandle HTextureImage; -typedef Qt3DCore::QHandle HBuffer; -typedef Qt3DCore::QHandle HAttribute; -typedef Qt3DCore::QHandle HGeometry; -typedef Qt3DCore::QHandle HGeometryRenderer; -typedef Qt3DCore::QHandle HObjectPicker; -typedef Qt3DCore::QHandle HBoundingVolumeDebug; -typedef Qt3DCore::QHandle HLight; -typedef Qt3DCore::QHandle HEnvironmentLight; -typedef Qt3DCore::QHandle HComputeCommand; -typedef Qt3DCore::QHandle HGLBuffer; -typedef Qt3DCore::QHandle HRenderState; +typedef Qt3DCore::QHandle HAttachment; +typedef Qt3DCore::QHandle HCamera; +typedef Qt3DCore::QHandle HFilterKey; +typedef Qt3DCore::QHandle HEffect; +typedef Qt3DCore::QHandle HEntity; +typedef Qt3DCore::QHandle HFrameGraphNode; +typedef Qt3DCore::QHandle HLayer; +typedef Qt3DCore::QHandle HLevelOfDetail; +typedef Qt3DCore::QHandle HMaterial; +typedef Qt3DCore::QHandle HMatrix; +typedef Qt3DCore::QHandle HVao; +typedef Qt3DCore::QHandle HShader; +typedef Qt3DCore::QHandle HTechnique; +typedef Qt3DCore::QHandle HTexture; +typedef Qt3DCore::QHandle HTransform; +typedef Qt3DCore::QHandle HTarget; +typedef Qt3DCore::QHandle HRenderPass; +typedef Qt3DCore::QHandle HTextureData; +typedef Qt3DCore::QHandle HParameter; +typedef Qt3DCore::QHandle HShaderData; +typedef Qt3DCore::QHandle HTextureImage; +typedef Qt3DCore::QHandle HBuffer; +typedef Qt3DCore::QHandle HAttribute; +typedef Qt3DCore::QHandle HGeometry; +typedef Qt3DCore::QHandle HGeometryRenderer; +typedef Qt3DCore::QHandle HObjectPicker; +typedef Qt3DCore::QHandle HBoundingVolumeDebug; +typedef Qt3DCore::QHandle HLight; +typedef Qt3DCore::QHandle HEnvironmentLight; +typedef Qt3DCore::QHandle HComputeCommand; +typedef Qt3DCore::QHandle HGLBuffer; +typedef Qt3DCore::QHandle HRenderState; } // namespace Render diff --git a/src/render/backend/managers_p.h b/src/render/backend/managers_p.h index c5af93b8d..3be7e31b4 100644 --- a/src/render/backend/managers_p.h +++ b/src/render/backend/managers_p.h @@ -89,7 +89,6 @@ namespace Render { class AttachmentManager : public Qt3DCore::QResourceManager< RenderTargetOutput, Qt3DCore::QNodeId, - 16, Qt3DCore::NonLockingPolicy> { public: @@ -99,7 +98,6 @@ public: class CameraManager : public Qt3DCore::QResourceManager< CameraLens, Qt3DCore::QNodeId, - 8, Qt3DCore::NonLockingPolicy> { public: @@ -109,7 +107,6 @@ public: class FilterKeyManager : public Qt3DCore::QResourceManager< FilterKey, Qt3DCore::QNodeId, - 16, Qt3DCore::NonLockingPolicy> { @@ -120,7 +117,6 @@ public: class EffectManager : public Qt3DCore::QResourceManager< Effect, Qt3DCore::QNodeId, - 16, Qt3DCore::NonLockingPolicy> { public: @@ -130,7 +126,6 @@ public: class Q_AUTOTEST_EXPORT EntityManager : public Qt3DCore::QResourceManager< Entity, Qt3DCore::QNodeId, - 16, Qt3DCore::NonLockingPolicy> { public: @@ -164,7 +159,6 @@ private: class LayerManager : public Qt3DCore::QResourceManager< Layer, Qt3DCore::QNodeId, - 16, Qt3DCore::NonLockingPolicy> { public: @@ -174,7 +168,6 @@ public: class LevelOfDetailManager : public Qt3DCore::QResourceManager< LevelOfDetail, Qt3DCore::QNodeId, - 16, Qt3DCore::NonLockingPolicy> { public: @@ -184,7 +177,6 @@ public: class MaterialManager : public Qt3DCore::QResourceManager< Material, Qt3DCore::QNodeId, - 16, Qt3DCore::NonLockingPolicy> { public: @@ -194,7 +186,6 @@ public: class MatrixManager : public Qt3DCore::QResourceManager< QMatrix4x4, Qt3DCore::QNodeId, - 16, Qt3DCore::NonLockingPolicy> { public: @@ -204,7 +195,6 @@ public: class ShaderManager : public Qt3DCore::QResourceManager< Shader, Qt3DCore::QNodeId, - 16, Qt3DCore::NonLockingPolicy> { public: @@ -214,7 +204,6 @@ public: class TextureManager : public Qt3DCore::QResourceManager< Texture, Qt3DCore::QNodeId, - 16, Qt3DCore::NonLockingPolicy> { public: @@ -239,7 +228,6 @@ private: class TransformManager : public Qt3DCore::QResourceManager< Transform, Qt3DCore::QNodeId, - 16, Qt3DCore::NonLockingPolicy> { public: @@ -249,7 +237,6 @@ public: class VAOManager : public Qt3DCore::QResourceManager< OpenGLVertexArrayObject, VAOIdentifier, - 16, Qt3DCore::NonLockingPolicy> { public: @@ -259,7 +246,6 @@ public: class RenderTargetManager : public Qt3DCore::QResourceManager< RenderTarget, Qt3DCore::QNodeId, - 8, Qt3DCore::NonLockingPolicy> { public: @@ -269,7 +255,6 @@ public: class RenderPassManager : public Qt3DCore::QResourceManager< RenderPass, Qt3DCore::QNodeId, - 16, Qt3DCore::NonLockingPolicy> { public: @@ -280,7 +265,6 @@ public: class ParameterManager : public Qt3DCore::QResourceManager< Parameter, Qt3DCore::QNodeId, - 16, Qt3DCore::NonLockingPolicy> { public: @@ -290,7 +274,6 @@ public: class ShaderDataManager : public Qt3DCore::QResourceManager< ShaderData, Qt3DCore::QNodeId, - 16, Qt3DCore::NonLockingPolicy> { public: @@ -300,7 +283,6 @@ public: class GLBufferManager : public Qt3DCore::QResourceManager< GLBuffer, Qt3DCore::QNodeId, - 16, Qt3DCore::NonLockingPolicy> { }; @@ -308,7 +290,6 @@ class GLBufferManager : public Qt3DCore::QResourceManager< class TextureImageManager : public Qt3DCore::QResourceManager< TextureImage, Qt3DCore::QNodeId, - 16, Qt3DCore::NonLockingPolicy> { }; @@ -316,7 +297,6 @@ class TextureImageManager : public Qt3DCore::QResourceManager< class AttributeManager : public Qt3DCore::QResourceManager< Attribute, Qt3DCore::QNodeId, - 20, Qt3DCore::NonLockingPolicy> { }; @@ -324,7 +304,6 @@ class AttributeManager : public Qt3DCore::QResourceManager< class GeometryManager : public Qt3DCore::QResourceManager< Geometry, Qt3DCore::QNodeId, - 16, Qt3DCore::NonLockingPolicy> { }; @@ -332,7 +311,6 @@ class GeometryManager : public Qt3DCore::QResourceManager< class ObjectPickerManager : public Qt3DCore::QResourceManager< ObjectPicker, Qt3DCore::QNodeId, - 16, Qt3DCore::NonLockingPolicy> { }; @@ -341,7 +319,6 @@ class ObjectPickerManager : public Qt3DCore::QResourceManager< class BoundingVolumeDebugManager : public Qt3DCore::QResourceManager< BoundingVolumeDebug, Qt3DCore::QNodeId, - 16, Qt3DCore::ObjectLevelLockingPolicy> { }; @@ -350,7 +327,6 @@ class BoundingVolumeDebugManager : public Qt3DCore::QResourceManager< class LightManager : public Qt3DCore::QResourceManager< Light, Qt3DCore::QNodeId, - 16, Qt3DCore::NonLockingPolicy> { public: @@ -360,7 +336,6 @@ public: class EnvironmentLightManager : public Qt3DCore::QResourceManager< EnvironmentLight, Qt3DCore::QNodeId, - 16, Qt3DCore::NonLockingPolicy> { public: @@ -370,7 +345,6 @@ public: class ComputeCommandManager : public Qt3DCore::QResourceManager< ComputeCommand, Qt3DCore::QNodeId, - 16, Qt3DCore::NonLockingPolicy> { public: @@ -380,7 +354,6 @@ public: class RenderStateManager : public Qt3DCore::QResourceManager< RenderStateNode, Qt3DCore::QNodeId, - 16, Qt3DCore::NonLockingPolicy> { }; diff --git a/src/render/backend/renderview.cpp b/src/render/backend/renderview.cpp index a2eefd911..341a25e61 100644 --- a/src/render/backend/renderview.cpp +++ b/src/render/backend/renderview.cpp @@ -543,14 +543,14 @@ QVector RenderView::buildDrawRenderCommands(const QVectorcomponentHandle(); + HGeometryRenderer geometryRendererHandle = node->componentHandle(); // There is a geometry renderer with geometry if ((geometryRenderer = m_manager->geometryRendererManager()->data(geometryRendererHandle)) != nullptr && geometryRenderer->isEnabled() && !geometryRenderer->geometryId().isNull()) { const Qt3DCore::QNodeId materialComponentId = node->componentUuid(); - const HMaterial materialHandle = node->componentHandle(); + const HMaterial materialHandle = node->componentHandle(); const QVector renderPassData = m_parameters.value(materialComponentId); HGeometry geometryHandle = m_manager->lookupHandle(geometryRenderer->geometryId()); Geometry *geometry = m_manager->data(geometryHandle); diff --git a/src/render/framegraph/renderpassfilternode_p.h b/src/render/framegraph/renderpassfilternode_p.h index ee9137b04..cd0d3a361 100644 --- a/src/render/framegraph/renderpassfilternode_p.h +++ b/src/render/framegraph/renderpassfilternode_p.h @@ -62,7 +62,7 @@ namespace Qt3DRender { class QFilterKey; class QRenderPassFilter; -template +template class QHandle; namespace Render { diff --git a/src/render/framegraph/techniquefilternode_p.h b/src/render/framegraph/techniquefilternode_p.h index 091dc1cf7..3fb8abb84 100644 --- a/src/render/framegraph/techniquefilternode_p.h +++ b/src/render/framegraph/techniquefilternode_p.h @@ -65,7 +65,7 @@ namespace Qt3DRender { class QFilterKey; class QTechniqueFilter; -template +template class QHandle; namespace Render { diff --git a/src/render/geometry/buffermanager_p.h b/src/render/geometry/buffermanager_p.h index ed3563876..f2b0715ec 100644 --- a/src/render/geometry/buffermanager_p.h +++ b/src/render/geometry/buffermanager_p.h @@ -63,7 +63,6 @@ namespace Render { class Q_AUTOTEST_EXPORT BufferManager : public Qt3DCore::QResourceManager< Buffer, Qt3DCore::QNodeId, - 16, Qt3DCore::ObjectLevelLockingPolicy> { public: diff --git a/src/render/geometry/geometryrenderermanager_p.h b/src/render/geometry/geometryrenderermanager_p.h index e3b313569..becf1bcc1 100644 --- a/src/render/geometry/geometryrenderermanager_p.h +++ b/src/render/geometry/geometryrenderermanager_p.h @@ -63,7 +63,6 @@ namespace Render { class Q_AUTOTEST_EXPORT GeometryRendererManager : public Qt3DCore::QResourceManager< GeometryRenderer, Qt3DCore::QNodeId, - 16, Qt3DCore::ObjectLevelLockingPolicy> { public: diff --git a/src/render/io/scenemanager.cpp b/src/render/io/scenemanager.cpp index 8e6af8c40..e42601e32 100644 --- a/src/render/io/scenemanager.cpp +++ b/src/render/io/scenemanager.cpp @@ -46,7 +46,6 @@ namespace Render { SceneManager::SceneManager() : Qt3DCore::QResourceManager() { } diff --git a/src/render/io/scenemanager_p.h b/src/render/io/scenemanager_p.h index 941b90a4d..14a599af8 100644 --- a/src/render/io/scenemanager_p.h +++ b/src/render/io/scenemanager_p.h @@ -68,7 +68,6 @@ namespace Render { class Q_AUTOTEST_EXPORT SceneManager : public Qt3DCore::QResourceManager< Scene, Qt3DCore::QNodeId, - 8, Qt3DCore::ObjectLevelLockingPolicy> { public: diff --git a/src/render/jobs/pickboundingvolumejob.cpp b/src/render/jobs/pickboundingvolumejob.cpp index 19c9932f5..616ee0ca8 100644 --- a/src/render/jobs/pickboundingvolumejob.cpp +++ b/src/render/jobs/pickboundingvolumejob.cpp @@ -317,14 +317,14 @@ void PickBoundingVolumeJob::dispatchPickEvents(const QMouseEvent &event, for (const QCollisionQueryResult::Hit &hit : qAsConst(sphereHits)) { Entity *entity = m_manager->renderNodesManager()->lookupResource(hit.m_entityId); - HObjectPicker objectPickerHandle = entity->componentHandle(); + HObjectPicker objectPickerHandle = entity->componentHandle(); // If the Entity which actually received the hit doesn't have // an object picker component, we need to check the parent if it has one ... while (objectPickerHandle.isNull() && entity != nullptr) { entity = entity->parent(); if (entity != nullptr) - objectPickerHandle = entity->componentHandle(); + objectPickerHandle = entity->componentHandle(); } ObjectPicker *objectPicker = m_manager->objectPickerManager()->data(objectPickerHandle); diff --git a/src/render/jobs/pickboundingvolumeutils.cpp b/src/render/jobs/pickboundingvolumeutils.cpp index 70f0b7f95..5c778bf29 100644 --- a/src/render/jobs/pickboundingvolumeutils.cpp +++ b/src/render/jobs/pickboundingvolumeutils.cpp @@ -194,7 +194,7 @@ AbstractCollisionGathererFunctor::~AbstractCollisionGathererFunctor() AbstractCollisionGathererFunctor::result_type AbstractCollisionGathererFunctor::operator ()(const Entity *entity) const { - HObjectPicker objectPickerHandle = entity->componentHandle(); + HObjectPicker objectPickerHandle = entity->componentHandle(); // If the Entity which actually received the hit doesn't have // an object picker component, we need to check the parent if it has one ... @@ -202,7 +202,7 @@ AbstractCollisionGathererFunctor::result_type AbstractCollisionGathererFunctor:: while (objectPickerHandle.isNull() && parentEntity != nullptr) { parentEntity = parentEntity->parent(); if (parentEntity != nullptr) - objectPickerHandle = parentEntity->componentHandle(); + objectPickerHandle = parentEntity->componentHandle(); } ObjectPicker *objectPicker = m_manager->objectPickerManager()->data(objectPickerHandle); @@ -299,7 +299,7 @@ bool HierarchicalEntityPicker::collectHits(Entity *root) QRayCastingService rayCasting; std::vector> worklist; - worklist.push_back({root, !root->componentHandle().isNull()}); + worklist.push_back({root, !root->componentHandle().isNull()}); while (!worklist.empty()) { auto current = worklist.back(); @@ -320,7 +320,7 @@ bool HierarchicalEntityPicker::collectHits(Entity *root) // and pick children for (auto child: current.first->children()) - worklist.push_back({child, current.second || !child->componentHandle().isNull()}); + worklist.push_back({child, current.second || !child->componentHandle().isNull()}); } return !m_hits.empty(); diff --git a/src/render/materialsystem/techniquemanager_p.h b/src/render/materialsystem/techniquemanager_p.h index 5b390f94b..8108d5f5b 100644 --- a/src/render/materialsystem/techniquemanager_p.h +++ b/src/render/materialsystem/techniquemanager_p.h @@ -63,7 +63,6 @@ namespace Render { class Q_AUTOTEST_EXPORT TechniqueManager : public Qt3DCore::QResourceManager< Technique, Qt3DCore::QNodeId, - 16, Qt3DCore::NonLockingPolicy> { public: diff --git a/tests/auto/core/qresourcemanager/tst_qresourcemanager.cpp b/tests/auto/core/qresourcemanager/tst_qresourcemanager.cpp index b7bd7c28a..9a387a919 100644 --- a/tests/auto/core/qresourcemanager/tst_qresourcemanager.cpp +++ b/tests/auto/core/qresourcemanager/tst_qresourcemanager.cpp @@ -31,12 +31,12 @@ #include #include -class tst_DynamicArrayPolicy : public QObject +class tst_QResourceManager : public QObject { Q_OBJECT public: - tst_DynamicArrayPolicy() {} - ~tst_DynamicArrayPolicy() {} + tst_QResourceManager() {} + ~tst_QResourceManager() {} private slots: void createResourcesManager(); @@ -48,7 +48,7 @@ private slots: void releaseResource(); void heavyDutyMultiThreadedAccess(); void heavyDutyMultiThreadedAccessRelease(); - void maximumNumberOfResources(); + void collectResources(); void activeHandles(); }; @@ -68,29 +68,21 @@ Q_DECLARE_RESOURCE_INFO(tst_ArrayResource, Q_REQUIRES_CLEANUP) QT_END_NAMESPACE typedef Qt3DCore::QHandle tHandle; -typedef Qt3DCore::QHandle tHandle4; -typedef Qt3DCore::QHandle tHandle8; -typedef Qt3DCore::QHandle tHandle16; -void tst_DynamicArrayPolicy::createResourcesManager() +void tst_QResourceManager::createResourcesManager() { - Qt3DCore::QResourceManager manager16; - Qt3DCore::QResourceManager manager4; - Qt3DCore::QResourceManager manager8; - QVERIFY(manager16.maximumSize() == 65535); - QVERIFY(manager8.maximumSize() == 255); - QVERIFY(manager4.maximumSize() == 15); + Qt3DCore::QResourceManager manager; } /*! * Check that the handles returned when a registering resources * have a correct index and counter. */ -void tst_DynamicArrayPolicy::acquireResources() +void tst_QResourceManager::acquireResources() { - Qt3DCore::QResourceManager manager; + Qt3DCore::QResourceManager manager; - QList handles; + QList handles; for (int i = 0; i < 5; i++) { handles << manager.acquire(); @@ -106,12 +98,12 @@ void tst_DynamicArrayPolicy::acquireResources() /*! * Test that values can be properly retrieved. */ -void tst_DynamicArrayPolicy::getResources() +void tst_QResourceManager::getResources() { - Qt3DCore::QResourceManager manager; + Qt3DCore::QResourceManager manager; QList resources; - QList handles; + QList handles; for (int i = 0; i < 5; i++) { handles << manager.acquire(); @@ -127,7 +119,7 @@ void tst_DynamicArrayPolicy::getResources() QVERIFY(manager.data(handles.at(i))->m_value == i); // Check that an invalid resource returns NULL - tHandle8 iHandle; + tHandle iHandle; QVERIFY(manager.data(iHandle) == nullptr); } @@ -136,10 +128,10 @@ void tst_DynamicArrayPolicy::getResources() * Test that when a resize of the data vectors in the manager occurs, * everything behaves correctly. */ -void tst_DynamicArrayPolicy::registerResourcesResize() +void tst_QResourceManager::registerResourcesResize() { - Qt3DCore::QResourceManager manager; - QList handles; + Qt3DCore::QResourceManager manager; + QList handles; for (uint i = 0; i < 2; i++) { handles << manager.acquire(); @@ -162,7 +154,7 @@ void tst_DynamicArrayPolicy::registerResourcesResize() /*! * Checks for the removal of resources. */ -void tst_DynamicArrayPolicy::removeResource() +void tst_QResourceManager::removeResource() { Qt3DCore::QResourceManager manager; @@ -185,12 +177,12 @@ void tst_DynamicArrayPolicy::removeResource() QVERIFY(manager.data(nHandle) != nullptr); } -void tst_DynamicArrayPolicy::lookupResource() +void tst_QResourceManager::lookupResource() { Qt3DCore::QResourceManager manager; QList resources; - QList handles; + QList handles; for (int i = 0; i < 5; i++) { handles << manager.acquire(); @@ -198,7 +190,7 @@ void tst_DynamicArrayPolicy::lookupResource() resources.at(i)->m_value = 4; } - tHandle16 t = manager.lookupHandle(2); + tHandle t = manager.lookupHandle(2); QVERIFY(t.handle() == 0); QVERIFY(manager.data(t) == nullptr); tst_ArrayResource *resource = manager.getOrCreateResource(2); @@ -210,7 +202,7 @@ void tst_DynamicArrayPolicy::lookupResource() QVERIFY(manager.data(t) == resource); } -void tst_DynamicArrayPolicy::releaseResource() +void tst_QResourceManager::releaseResource() { Qt3DCore::QResourceManager manager; QList resources; @@ -236,7 +228,6 @@ public: typedef Qt3DCore::QResourceManager Manager; tst_Thread() @@ -267,7 +258,7 @@ protected: Manager *m_manager; }; -void tst_DynamicArrayPolicy::heavyDutyMultiThreadedAccess() +void tst_QResourceManager::heavyDutyMultiThreadedAccess() { tst_Thread::Manager *manager = new tst_Thread::Manager(); @@ -306,7 +297,6 @@ public: typedef Qt3DCore::QResourceManager Manager; tst_Thread2(int releaseAbove = 7) @@ -341,7 +331,7 @@ protected: int m_releaseAbove; }; -void tst_DynamicArrayPolicy::heavyDutyMultiThreadedAccessRelease() +void tst_QResourceManager::heavyDutyMultiThreadedAccessRelease() { tst_Thread2::Manager *manager = new tst_Thread2::Manager(); @@ -377,21 +367,28 @@ void tst_DynamicArrayPolicy::heavyDutyMultiThreadedAccessRelease() delete manager; } -void tst_DynamicArrayPolicy::maximumNumberOfResources() +void tst_QResourceManager::collectResources() { Qt3DCore::QResourceManager manager; QList resources; - QList handles; + QList handles; - for (int i = 0; i < manager.maximumSize(); i++) { + for (int i = 0; i < 65536; i++) { handles << manager.acquire(); resources << manager.data(handles.at(i)); resources.at(i)->m_value = 4; } + for (auto h : handles) { + manager.release(h); + } + Q_ASSERT(manager.count() == 0); + handles.clear(); + manager.acquire(); + Q_ASSERT(manager.count() == 1); } -void tst_DynamicArrayPolicy::activeHandles() +void tst_QResourceManager::activeHandles() { // GIVEN Qt3DCore::QResourceManager manager; @@ -428,6 +425,6 @@ void tst_DynamicArrayPolicy::activeHandles() -QTEST_APPLESS_MAIN(tst_DynamicArrayPolicy) +QTEST_APPLESS_MAIN(tst_QResourceManager) #include "tst_qresourcemanager.moc" diff --git a/tests/benchmarks/core/qresourcesmanager/qresourcesmanager/tst_bench_qresourcesmanager.cpp b/tests/benchmarks/core/qresourcesmanager/qresourcesmanager/tst_bench_qresourcesmanager.cpp index 51eb2d6fc..3046fcb98 100644 --- a/tests/benchmarks/core/qresourcesmanager/qresourcesmanager/tst_bench_qresourcesmanager.cpp +++ b/tests/benchmarks/core/qresourcesmanager/qresourcesmanager/tst_bench_qresourcesmanager.cpp @@ -69,7 +69,7 @@ public: template void benchmarkAllocateResources() { - Qt3DCore::QResourceManager manager; + Qt3DCore::QResourceManager manager; volatile Resource *c; QBENCHMARK_ONCE { @@ -83,7 +83,7 @@ void benchmarkAllocateResources() template void benchmarkAccessResources() { - Qt3DCore::QResourceManager manager; + Qt3DCore::QResourceManager manager; const int max = (1 << 16) - 1; QVector > handles(max); for (int i = 0; i < max; i++) @@ -99,7 +99,7 @@ void benchmarkAccessResources() template void benchmarkRandomAccessResource() { - Qt3DCore::QResourceManager manager; + Qt3DCore::QResourceManager manager; const int max = (1 << 16) - 1; QVector > handles(max); for (int i = 0; i < max; i++) @@ -118,7 +118,7 @@ void benchmarkRandomAccessResource() { template void benchmarkLookupResources() { - Qt3DCore::QResourceManager manager; + Qt3DCore::QResourceManager manager; const int max = (1 << 16) - 1; for (int i = 0; i < max; i++) manager.getOrCreateResource(i); @@ -134,7 +134,7 @@ void benchmarkLookupResources() template void benchmarkRandomLookupResources() { - Qt3DCore::QResourceManager manager; + Qt3DCore::QResourceManager manager; const int max = (1 << 16) - 1; QVector resourcesIndices(max); for (int i = 0; i < max; i++) { @@ -154,7 +154,7 @@ void benchmarkRandomLookupResources() template void benchmarkReleaseResources() { - Qt3DCore::QResourceManager manager; + Qt3DCore::QResourceManager manager; const int max = (1 << 16) - 1; QVector > handles(max); for (int i = 0; i < max; i++) -- cgit v1.2.3 From 78f77f80057b1e77c3f47d52de3e0b3f0c5d8d6e Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 1 Dec 2017 08:52:48 +0100 Subject: Quick3DNodeInstantiatorPrivate: Fix build after private API change qtdeclarative/60d589ccddb036e84883a6c2ef63a5292c8ad022 changed QQmlInstanceModel::object() to take an enumeration. Task-number: QTBUG-61537 Change-Id: I2fab7e80b728f9265e201f47614a79167199667f Reviewed-by: Richard Moe Gustavsen --- src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp b/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp index b99f6ae75..21f58e56d 100644 --- a/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp +++ b/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp @@ -135,7 +135,8 @@ void Quick3DNodeInstantiatorPrivate::regenerate() } for (int i = 0; i < m_instanceModel->count(); i++) { - QObject *object = m_instanceModel->object(i, m_async); + QObject *object = m_instanceModel->object(i, m_async ? + QQmlIncubator::Asynchronous : QQmlIncubator::AsynchronousIfNested); // If the item was already created we won't get a createdItem if (object) _q_createdItem(i, object); @@ -202,7 +203,8 @@ void Quick3DNodeInstantiatorPrivate::_q_modelUpdated(const QQmlChangeSet &change m_objects = m_objects.mid(0, index) + movedObjects + m_objects.mid(index); } else for (int i = 0; i < insert.count; ++i) { int modelIndex = index + i; - QObject *obj = m_instanceModel->object(modelIndex, m_async); + QObject *obj = m_instanceModel->object(modelIndex, m_async ? + QQmlIncubator::Asynchronous : QQmlIncubator::AsynchronousIfNested); if (obj) _q_createdItem(modelIndex, obj); } -- cgit v1.2.3 From c9edc164ab165ddd31ef2411be19deb130614e8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= Date: Wed, 13 Dec 2017 23:58:36 +0100 Subject: Set devicePixelRatio on item size change Propagate the dpr to the QRenderSurfaceSelector in addition to the the item size. Task-number: QTBUG-62235 Change-Id: I6555685392334b8edf2327fae97d5d531cffeaae Reviewed-by: Sean Harmer --- src/quick3d/imports/scene3d/scene3ditem.cpp | 6 ++++-- src/quick3d/imports/scene3d/scene3ditem_p.h | 2 +- src/quick3d/imports/scene3d/scene3drenderer.cpp | 9 +++++---- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/quick3d/imports/scene3d/scene3ditem.cpp b/src/quick3d/imports/scene3d/scene3ditem.cpp index c31f4aa97..ab832d463 100644 --- a/src/quick3d/imports/scene3d/scene3ditem.cpp +++ b/src/quick3d/imports/scene3d/scene3ditem.cpp @@ -223,11 +223,13 @@ void Scene3DItem::setWindowSurface(QObject *rootObject) } } -void Scene3DItem::setItemArea(QSize area) +void Scene3DItem::setItemAreaAndDevicePixelRatio(QSize area, qreal devicePixelRatio) { Qt3DRender::QRenderSurfaceSelector *surfaceSelector = Qt3DRender::QRenderSurfaceSelectorPrivate::find(m_entity); - if (surfaceSelector) + if (surfaceSelector) { surfaceSelector->setExternalRenderTargetSize(area); + surfaceSelector->setSurfacePixelRatio(devicePixelRatio); + } } bool Scene3DItem::isHoverEnabled() const diff --git a/src/quick3d/imports/scene3d/scene3ditem_p.h b/src/quick3d/imports/scene3d/scene3ditem_p.h index e0ce3addc..37d7cbcc2 100644 --- a/src/quick3d/imports/scene3d/scene3ditem_p.h +++ b/src/quick3d/imports/scene3d/scene3ditem_p.h @@ -88,7 +88,7 @@ public: bool multisample() const; void setMultisample(bool enable); - Q_INVOKABLE void setItemArea(QSize area); + Q_INVOKABLE void setItemAreaAndDevicePixelRatio(QSize area, qreal devicePixelRatio); bool isHoverEnabled() const; enum CameraAspectRatioMode { diff --git a/src/quick3d/imports/scene3d/scene3drenderer.cpp b/src/quick3d/imports/scene3d/scene3drenderer.cpp index 26e966f76..23aaf9ed0 100644 --- a/src/quick3d/imports/scene3d/scene3drenderer.cpp +++ b/src/quick3d/imports/scene3d/scene3drenderer.cpp @@ -59,9 +59,9 @@ namespace Qt3DRender { namespace { -inline QMetaMethod setItemAreaMethod() +inline QMetaMethod setItemAreaAndDevicePixelRatioMethod() { - const int idx = Scene3DItem::staticMetaObject.indexOfMethod("setItemArea(QSize)"); + const int idx = Scene3DItem::staticMetaObject.indexOfMethod("setItemAreaAndDevicePixelRatio(QSize,qreal)"); Q_ASSERT(idx != -1); return Scene3DItem::staticMetaObject.method(idx); } @@ -267,8 +267,9 @@ void Scene3DRenderer::render() if (sizeHasChanged) { // We are in the QSGRenderThread (doing a direct call would result in a race) - static const QMetaMethod setItemArea = setItemAreaMethod(); - setItemArea.invoke(m_item, Qt::QueuedConnection, Q_ARG(QSize, boundingRectSize)); + static const QMetaMethod setItemAreaAndDevicePixelRatio = setItemAreaAndDevicePixelRatioMethod(); + setItemAreaAndDevicePixelRatio.invoke(m_item, Qt::QueuedConnection, Q_ARG(QSize, boundingRectSize), + Q_ARG(qreal, window->effectiveDevicePixelRatio())); } // Rebuild FBO and textures if never created or a resize has occurred -- cgit v1.2.3