summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge remote-tracking branch 'origin/5.12' into devLiang Qi2018-12-1127-154/+408
|\|
| * Enable ES3 rendering of MetalRoughMaterialMichael Brasser2018-12-052-1/+32
| * Add missing precision specifiers for ES3Michael Brasser2018-12-052-11/+11
| * Use the correct coordinatesystem include for ES3Michael Brasser2018-12-051-0/+9
| * Update QML import versions in "Qt3D QML Types"Kai Koehne2018-12-051-13/+13
| * Merge remote-tracking branch 'origin/5.12.0' into 5.12Qt Forward Merge Bot2018-12-052-2/+22
| |\
| | * Doc: Add QT3D_REGISTER_ASPECT macro documentationPaul Wicking2018-11-062-2/+22
| * | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-12-043-6/+12
| |\ \
| | * | Reset last selected picker when releasing out of viewportPaul Lemire2018-11-301-1/+7
| | * | Renderer: drawArraysInstancedBaseInstance parameters were swappedPaul Lemire2018-11-282-5/+5
| * | | Add ES3-specific coordinate systems shader fragmentMauro Persano2018-11-082-0/+74
| * | | Merge "Merge remote-tracking branch 'origin/5.11' into 5.12" into refs/stagin...Liang Qi2018-11-082-5/+7
| |\ \ \
| | * | | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-11-082-5/+7
| | |\| |
| | | * | Renderer::doRender scene3dBlocking fixesPaul Lemire2018-11-051-4/+7
| | | * | GLTexture: do not set layers when target is Texture3DPaul Lemire2018-11-021-1/+0
| * | | | Add documentation for QText2DEntityMike Krus2018-11-083-11/+88
| |/ / /
| * | | Documentation: Get rid of QT_INSTALL_HEADERS in documentation configTopi Reinio2018-11-073-12/+20
| * | | Doc: Fix various documentation warningsTopi Reinio2018-11-075-2/+6
| * | | Qt3DWindow: Redraw scene on expose events when using OnDemand renderingChristian Andersen2018-11-063-0/+21
| * | | Make floating point precision explicit in ES3 MetalRough shaderMauro Persano2018-11-051-92/+94
* | | | QComputeCommand allow to control the run behaviorPaul Lemire2018-11-147-8/+158
* | | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-11-0312-8/+136
|\| | |
| * | | Doc: Add doc to undocumented methodsNico Vertriest2018-11-017-1/+52
| * | | Doc: Add doc to undocumented methods and properties qt3dNico Vertriest2018-11-011-3/+71
| | |/ | |/|
| * | Merge remote-tracking branch 'origin/5.11' into 5.12.0v5.12.0-beta4Liang Qi2018-10-301-0/+3
| |\|
| | * Fix crash due to racecondition in renderer on shutdownChristian Andersen2018-10-231-0/+3
| * | Don't trigger Q_UNREACHABLE if passed invalid render buffer formatsChristian Andersen2018-10-222-3/+9
| * | Doc: Fix external link errorNico Vertriest2018-10-221-1/+1
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-10-204-12/+14
|\| |
| * | Doc: fix broken links in qanimationcallback.cpp and qframegraphnode.cppv5.12.0-beta3Nico Vertriest2018-10-182-1/+2
| * | Doc: Minor corrections overview pageNico Vertriest2018-10-151-11/+11
| * | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-10-131-0/+1
| |\|
| | * Fix notifications for QClipAnimator::clip propertyJim Albamont2018-10-051-0/+1
* | | Make backend FG node use FrameGraphDirty instead of AllDirtyPaul Lemire2018-10-1216-40/+75
* | | Implement WaitFence/SetFence handling into the rendererPaul Lemire2018-10-1229-19/+530
* | | Register QWaitFence/QSetFence with QML modulePaul Lemire2018-10-111-0/+4
* | | Add backend nodes for QWaitFence and QSetFencePaul Lemire2018-10-116-3/+360
* | | Texture: update renderer to send handle and handle type on frontend texturesPaul Lemire2018-10-114-24/+52
* | | Merge "Merge branch '5.12' into dev" into refs/staging/devSean Harmer2018-10-1141-937/+2231
|\ \ \
| * | | Merge branch '5.12' into devSean Harmer2018-10-1141-937/+2231
| |\| |
| | * | Update plugins.qmltypesv5.12.0-beta2Kai Koehne2018-10-0915-894/+1632
| | * | Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-10-0526-43/+617
| | |\|
| | | * Fix normal calculation in MorphPhongMaterialJoni Poikelin2018-10-052-2/+2
| | | * Fix compilation with -qt3d-profile-jobs on AndroidPaul Lemire2018-10-051-0/+5
| | | * Further complete missing functions on ES3 helpersPaul Lemire2018-10-044-0/+23
| | | * Fix leak with VAOManagerPaul Lemire2018-10-033-1/+8
| | | * QChangeArbiter: fix leakPaul Lemire2018-10-031-2/+5
| | | * Fix QMorphPhongMaterialMäättä Antti2018-10-012-6/+23
| | | * Add metalRoughFunction to ES3Mauro Persano2018-09-275-0/+467
| | | * ES3 deprecated gl_FragColor, use output variable insteadMauro Persano2018-09-271-0/+9