summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
| | * Renderer: check context thread before destroying resourcesPaul Lemire2019-10-161-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only try to cleanup the resources if we know we are called from the right thread. releaseGraphicsResources can be called from 2 places: - Scene3DCleaner when using Scene3D (when closing the window) - AspectThread when the RenderAspect gets unregistered In configurations where the context lives in the main thread (Scene3D + single threaded render loop / ANGLE), the RenderAspect gets unregistered before the Scene3DCleaner has had time to call releaseGraphicsResources. This means that we won't release the resources ourselved and that the driver will have to do that for us. This has been fixed properly in 5.14 with the AspectThread removal. Task-number: QTBUG-60971 Change-Id: I49c1c2f74ad09e7162b988f87bac65863f8490d8 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* | | QSubtreeEnabler: fix doc typoPaul Lemire2019-10-171-1/+1
|/ / | | | | | | | | Change-Id: I695ccc4ba4652cff114f519b7c0f9728b39729ec Reviewed-by: Michael Brasser <michael.brasser@live.com>
* | QTextureLoader: reset target and format on source changePaul Lemire2019-10-161-0/+5
| | | | | | | | | | | | | | | | Could otherwise prevent reloading the content of the texture when the generator/source changes Change-Id: I5cf3389792032ba7a85a111f04dd4670a3091683 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* | Scene3D: fix next frame update requestPaul Lemire2019-10-152-3/+14
| | | | | | | | | | | | | | | | | | | | | | We were requesting a QQuickItem frame update in the middle of an update which lead to it being ignored. This led to some scene not being refreshed or rendered until the window was moved (which forced an update) Change-Id: I9f411b4cfe18813d3e24ac02daa138822c767a46 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* | Scene3D: only show SGNode once Qt3D has first rendered into itPaul Lemire2019-10-157-1/+27
| | | | | | | | | | | | | | Avoids seeing garbage for the first frame (with planets-qml) Change-Id: I3445ce47f27bb921c15861e580a8cc6c7d8cc645 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* | Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"Paul Lemire2019-10-1525-42/+194
|\ \
| * | Merge remote-tracking branch 'origin/5.13' into 5.14Paul Lemire2019-10-1525-42/+194
| |\| | | | | | | | | | Change-Id: I44133fbc9b93e96918463b0b0891ee5ab7db9f2c
| | * Doc: Use correct qml module names for qml typesPaul Wicking2019-10-142-1/+2
| | | | | | | | | | | | | | | Change-Id: I19c9f2a3d31af77366316e78194a15789d1b67f9 Reviewed-by: Martin Smith <martin.smith@qt.io>
| | * Add note to material system nodes that can't be disabledAntti Määttä2019-10-104-0/+16
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-67017 Change-Id: I20acb3aa5e778be7752e1568b08001838f094eb3 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| | * Make sure right screen is set on QOpenGLContext and QOffscreenSurfaceAndy Shaw2019-10-109-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the Qt3D window is on a specific screen, then it needs to ensure that any supporting QOpenGLContexts and QOffscreenSurfaces are set to be using that same screen or it will fail to render the content. Change-Id: Ief4f3e88bf6f71862bc5dace0cb0bddcdf3a98b5 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| | * Fix blitting to also blit depth and stencil buffersPaul Lemire2019-10-091-1/+2
| | | | | | | | | | | | | | | Change-Id: Ib7b491c638508cfcdfbd523fd4e6a3d757c2c832 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| | * Prevent picking from losing eventsAntti Määttä2019-10-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use append instead of assingment in PickBoundingVolumeJobs setxxxEvents. The setters gets called more times than the job gets to run so appending will not overwrite the events we have not processed yet. Task-number: QTBUG-69397 Change-Id: I4823ac5f622f636ee18af64d729ef196f76bc886 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| | * Add comment about far plane value affecting pickingAntti Määttä2019-10-091-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-70589 Change-Id: I397d24f3d7fed25fe3612e481a3ee16d4e0fe1ab Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| | * Fix rendering when closing and re-opening a windowTomi Korpipaa2019-10-091-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Scene3D stops rendering if a window is closed and then opened again. That happens because eventfilter was removed at SurfaceAboutToBeDestroyed. There is no need to remove the event filter, as a destroyed window will not receive any events in any case. Task-number: QTBUG-77263 Change-Id: I1bcf3c572da6c06c09d1d9590bd8481b1fed6953 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| | * Add documentation for AbstractClipAnimator QML type propertiesMats Honkamaa2019-10-081-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add documentation for the following QML properties: channelMapper, clock, normalizedTime, running. Task-number: QTBUG-78482 Change-Id: I1c24b5f9cbf647eda6f7bb329c58e496dcb22f4a Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| | * Clarify Scene2D input event supportTomi Korpipaa2019-10-071-0/+4
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-63900 Change-Id: I4a0331cd364480f6cdbf89e53ae486f13e6c3fe7 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| | * Ensure we can build assimp on Windows and macOS with non gcc compilersAndy Shaw2019-10-071-1/+1
| | | | | | | | | | | | | | | | | | Fixes: QTBUG-75145 Change-Id: Ibee7d877bf78c2d2ed74ac8a89b7af5bf22f14f1 Reviewed-by: Antti Määttä <antti.maatta@qt.io>
| | * Doc: Add inherits tags to ClipAnimator and BlendedClipAnimatorMats Honkamaa2019-10-042-0/+2
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-78485 Change-Id: Ic80a17b40c9ee81fd7bac2e669e729358c19c340 Reviewed-by: Mike Krus <mike.krus@kdab.com>
| | * Fix for bounding volume handling and calculationVolker Enderlein2019-10-013-34/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed Ritter algorithm implementation - Added notation of invalid bounding sphere (radius == -1.0) - Handle merging of invalid bounding sphere with valid ones - Added test cases and adjusted tests boundingsphere and proximityfilter - This is necessary to ensure the correct working for viewAll and viewEntity Task-number: QTBUG-78313 Change-Id: I1dc6d227cf9009f6fbd3230093c7a7a94fb05ae3 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | | Restore use of Added/Removed messages for aspects not supporting syncMike Krus2019-10-1417-50/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | If (third party) aspects don't support direct sync, restore use of PropertyValueAdded and PropertyValueRemoved messages so avoid breaking existing code Change-Id: Icac717583a8fe72acdb0cf599981251e310734bd Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | | Update QScene2D to use direct syncMike Krus2019-10-1411-140/+196
|/ / | | | | | | | | | | Change-Id: Iba2fa5ce9d295706fc50f904cac68f00bd8f02b7 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Update PickBoundingVolumeJob to use direct syncMike Krus2019-10-148-112/+115
| | | | | | | | | | Change-Id: I7878294cd44872ccdc17515fbb44a6b2a99239e5 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* | ShaderBuilder: ensure no old updates are left overPaul Lemire2019-10-143-3/+4
| | | | | | | | | | | | | | Could result in trying to send updates to nodes which have been destroyed. Change-Id: I3709277e5005f25ec8cb9efe0a2152f879bea89f Reviewed-by: Mike Krus <mike.krus@kdab.com>
* | renderviewjobutils.cpp: Remove unnecessary string conversionFriedemann Kleint2019-10-141-1/+1
| | | | | | | | | | | | | | | | | | Remove call to toLatin1(), fixing: enderers/opengl/jobs/renderviewjobutils.cpp: In member function 'void Qt3DRender::Render::UniformBlockValueBuilder::buildActiveUniformNameValueMapHelper(Qt3DRender::Render::ShaderData*, const QString&, const QString&, const QVariant&)': renderers/opengl/jobs/renderviewjobutils.cpp:516:126: warning: 'QString::QString(const QByteArray&)' is deprecated: Use fromUtf8, QStringLiteral, or QLatin1String [-Wdeprecated-declarations] Change-Id: I71afa2b29e7af6cb3acad008822b369acc66bed3 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Convert Shader/ShaderBuilder jobs to use direct syncPaul Lemire2019-10-1410-195/+160
| | | | | | | | | | Change-Id: Ia56ba6176c86e34904611ae57e682ac9d52c79f7 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* | Update QAbstractTexture message handlingMike Krus2019-10-113-63/+11
| | | | | | | | | | Change-Id: I5c0ff05d405766b2e0aee992ee1c150b5a0cf059 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Clean QJoint message handlingMike Krus2019-10-113-59/+8
| | | | | | | | | | Change-Id: Ib09024017a2d213e50b3acc89d7c411728eb1869 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Update MouseEventDispatcherJob to use direct syncMike Krus2019-10-116-63/+45
| | | | | | | | | | Change-Id: I972765a3937e580271127d7aa7e3cb76d76de818 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Update LoadProxyDeviceJob to use direct syncMike Krus2019-10-116-44/+65
| | | | | | | | | | Change-Id: I6d49abd28a665f89096ec2baaa861490c071d3d3 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Update keyboard handling jobs to use direct syncMike Krus2019-10-118-53/+78
| | | | | | | | | | Change-Id: I5284594ac1c23e59cf1d55ad90032c8cb89df657 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Update AxisAccumulatorJob to use direct syncMike Krus2019-10-115-37/+40
| | | | | | | | | | Change-Id: I4e64fa9f94dad1392b80851c2a6d8d4e013147f7 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Fix blitting to also blit depth and stencil buffersPaul Lemire2019-10-101-1/+2
| | | | | | | | | | Change-Id: Ib7b491c638508cfcdfbd523fd4e6a3d757c2c832 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* | Rebuild Material Caches when Shaders are dirtyPaul Lemire2019-10-101-1/+2
| | | | | | | | | | | | | | As the cache depends on both Material/FrameGraph and Shaders. Change-Id: I87c8ab20f37f111aa24c83401ee689f9e96681eb Reviewed-by: Mike Krus <mike.krus@kdab.com>
* | Convert LoadGeometryJob to use direct syncPaul Lemire2019-10-108-44/+51
| | | | | | | | | | Change-Id: Id744de2f10e7744ad5a9d4f425ae534153ed7446 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* | Update UpdateAxisActionJob to use direct syncMike Krus2019-10-098-51/+63
| | | | | | | | | | Change-Id: I227e1a5005a9001ac49d8b29daeb23be25fda53b Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Fix skeleton loadingMike Krus2019-10-091-1/+1
| | | | | | | | | | Change-Id: Ia097dd53f866112d7c51aff34aaa0418e6d40088 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Update UpdateLevelOfDetailJob to use direct syncMike Krus2019-10-0810-69/+168
| | | | | | | | | | Change-Id: I26ca21fc0f18bc79f3554824869eefc2178e83f8 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Update QShaderData to use direct syncPaul Lemire2019-10-085-214/+125
| | | | | | | | | | | | | | Also a bit of cleanup Change-Id: I317fa2dbaa62a55fe371e982ed23976e65696d79 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* | Remove CommandThread/GLCommandsPaul Lemire2019-10-087-502/+1
| | | | | | | | | | | | | | | | This has always been disabled, no point in keeping something we don't use. Can always be reverted later if we find it's actually required. Change-Id: Icc488b986cee90911a8b46cc88152938e786c1da Reviewed-by: Mike Krus <mike.krus@kdab.com>
* | Move skeleton loading code to jobMike Krus2019-10-084-219/+240
| | | | | | | | | | | | | | Also removes last couple of messages updating backend to frontend. Change-Id: I65056c7cf5ff06efab9c9a205f843ed882f9c0be Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Update LoadSkeletonJob to use direct syncMike Krus2019-10-087-50/+60
| | | | | | | | | | Change-Id: I5622f9784628b7217f6e37c700ac314b7264f439 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Update animation evaluation jobs to use direct syncMike Krus2019-10-0823-200/+299
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Animation data is now stored in the job which propagates them to the frontend at the end of the frame. Animated properties are passed using Qt's property system. Animated poses are passed via the frontend skeleton node. Syncing on new frame will take care of propagating both for use in other aspects. Callbacks are called by the job directly or stored and invoked on the main thread depending on the callback setting. Change-Id: I78675715799300bc1b27f854f1a445c00a2ac734 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Update LoadAnimationClipJob to use direct syncMike Krus2019-10-087-44/+45
| | | | | | | | | | Change-Id: I41f8de8776c40cf9ed4f08c33bd480a719aa1c82 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Fix compile warningsMike Krus2019-10-082-10/+10
| | | | | | | | | | Change-Id: Iac24c13fa77bb0c6317af77f61016ee6fbf9a916 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* | Update LoadSceneJob to use direct syncPaul Lemire2019-10-077-83/+80
| | | | | | | | | | Change-Id: Ie615b903e2bd2307e0b7fe853022ea9a17342ab8 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* | Update sendTextureChangesToFrontend to use direct syncPaul Lemire2019-10-078-94/+112
| | | | | | | | | | Change-Id: I9356186ca27518c32ae189d7e432969b767612e9 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* | Update world transform job to use direct syncPaul Lemire2019-10-074-15/+44
| | | | | | | | | | Change-Id: Ie6cdb99332b5c99e583bdb7dfa5c4810ea5bba72 Reviewed-by: Mike Krus <mike.krus@kdab.com>
* | QForwardRenderer: rename clearBuffers to buffersToClearPaul Lemire2019-10-072-9/+9
| | | | | | | | | | Change-Id: Ifda1f6f69a6dc58d426dfddbd711620c185a30ab Reviewed-by: Mike Krus <mike.krus@kdab.com>
* | QSortPolicy: document Texture sortingPaul Lemire2019-10-071-0/+3
| | | | | | | | | | Change-Id: Id3372bb01b84b5ac67e19b0f5dd0b605edb83f8f Reviewed-by: Mike Krus <mike.krus@kdab.com>
* | QRasterMode: add documentationPaul Lemire2019-10-071-0/+94
| | | | | | | | | | Change-Id: I170ae7db4e7fe338373c8c8d7c35dbd770e6fb0b Reviewed-by: Mike Krus <mike.krus@kdab.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-25 18:59:00 +0000