summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on '6.0' in qt/qt3dv6.0.4Jani Heikkinen2021-04-281-4/+4
| | | | | Change-Id: I55817b59cbbf2ff113d01c7b1dd3185840acbf4b Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.0' in qt/qt3dJani Heikkinen2021-04-261-4/+4
| | | | | Change-Id: I95948e7e2555b01e0e64d151a64508aeb45c4b10 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* pbr-material example: add qrc:/ prefix resource for assetsPaul Lemire2021-04-232-35/+35
| | | | | | | | | So that assets are properly picked up by Qt 6 Change-Id: I78eb79f0c4f5a2e124d57692d4af2947e743bd33 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 3dbfb4f73f0ade4d9bee5a243aa94c412b0ed73d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Fix qml module version to use the repo project versionAlexandru Croitor2021-04-169-9/+9
| | | | | | | | | | | | Use PROJECT_VERSION instead of CMAKE_PROJECT_VERSION, so that the repo project version is used in a top-level build, rather than the version of the qt5 project. Task-number: QTBUG-92861 Change-Id: I94ff185cf5f37b19959e620921b9c97fde1bfc07 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit d1bd4d78d7361f5d909be3184ce8bab8c5417945) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qt3dJani Heikkinen2021-04-121-4/+4
| | | | | Change-Id: I428bcb4120994ea581acfb0f917dc24530b440b2 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Bump versionJani Heikkinen2021-04-013-3/+3
| | | | Change-Id: I9e569dfe4156ca569eaaca5972f6b3d9c526a153
* Update dependencies on '6.0' in qt/qt3dv6.0.3Jani Heikkinen2021-03-261-4/+4
| | | | | Change-Id: I228c4d10ad0a09bcc92369232ea11e09ed156f98 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.0' in qt/qt3dJani Heikkinen2021-03-221-4/+4
| | | | | Change-Id: I58a9754096341549145b9cf2354e2221249d13a1 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Bump versionJani Heikkinen2021-03-053-3/+3
| | | | Change-Id: I38249a8c672b2e235b4a028e81737c3ba51514fc
* Update phong and metalrough shader graphsPaul Lemire2021-03-046-664/+611
| | | | | | | | | | | | - RHI requires updates to existing prototypes, explicit locations for inputs and outputs and treats samplers, uniforms and other inputs differently Change-Id: I7f8c6bf0d2a4732b8badcb7fb426f3349da3d6c3 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit 9c9284ce7f0d4ea3dda6d6bc6b602f5d4d6016d4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qt3dv6.0.2Jani Heikkinen2021-02-251-4/+4
| | | | | Change-Id: Ic60507aeb67342f515f20d93e756775220bb86db Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* QDiffuseMapMaterial: use proper RHI vertex shaderPaul Lemire2021-02-241-1/+1
| | | | | | | | | This material relies on vertex position, normal and tex coordinates. Change-Id: Ia6ce18d4a5f1aa267b5a82851b47e13aaa4da086 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit e7c53539ae743d49df7eab800e4b17f449f4f0e8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix QMetalRoughMaterial on RHIPaul Lemire2021-02-242-16/+42
| | | | | | | | | | Was still using the removed default.vert shader which was replaced by a combination of vertex shaders depending on the needed inputs. Change-Id: I5f4ba6fae6d5af317d6a00d9f4d484e817ca84a9 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 516a6c980f5e35ab0ec036be96ee00617c0de485) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qt3dJani Heikkinen2021-02-221-4/+4
| | | | | Change-Id: If30e274d35b0a74dd2ed80e70835712d979b6211 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Bump versionJani Heikkinen2021-02-220-0/+0
| | | | Change-Id: I9dd9272f9ccb912568718223434c8c78d4c822fe
* Bump versionJani Heikkinen2021-02-183-3/+3
| | | | Change-Id: I4bcdf9c959ce3ec25e29d89f5f2170659063cfb4
* Fix a number of MSVC int conversion warningsFriedemann Kleint2021-01-2922-56/+56
| | | | | | | | | | | - Port the qHash() functions to size_t - Add some casts - Adapt some types Change-Id: Ib889d46dd56c1a1c4bf6b87ae1f756c188069180 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit 05767abb7ef1b3c9c84633e53c29483510ba746d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix MSVC warning about inconsistent DLL linkage of QAnimationClipData ↵Friedemann Kleint2021-01-291-4/+4
| | | | | | | | | operator==/!= Change-Id: I8e63400ca2b2d6d7963b8ea6f111e6e9026f1278 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit 3e89237d9640ae9fb0b7e405a669864de403546d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qt3dv6.0.1Jani Heikkinen2021-01-281-4/+4
| | | | | Change-Id: I14682463b4121889651bfcae60b2d686ad592097 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Only declare staticVulkanInstance if QT_CONFIG(vulkan)Paul Lemire2021-01-271-0/+5
| | | | | | | | | | Should hopefully fix compile issues on platform when vulkan isn't found. Change-Id: Ia54486dc160960e0e7000c7de832f154ecee8b0c Task-number: QTBUG-90243 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit a70e425611d80cc1d62ddd724d9f234e213503fd) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qt3dJani Heikkinen2021-01-201-4/+4
| | | | | Change-Id: I2ffe8d34c7eaed830fa383688ff9ac678ba2b952 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.0' in qt/qt3dJani Heikkinen2021-01-191-4/+4
| | | | | Change-Id: Idf576a1971b26840fc11ec85803acbc72b68edf8 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update qt/qtquick3d-assimp submoduleJani Heikkinen2021-01-182-0/+1
| | | | | | | Fixes: QTBUG-89433 Pick-to: dev Change-Id: Iec372c94b541f871f3ed78843656c2dfa1a1f613 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* Update dependencies on '6.0' in qt/qt3dJani Heikkinen2021-01-171-4/+4
| | | | | Change-Id: I7e0ac92a9299bd066f3d017d1b0174ef688d7903 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Update dependencies on '6.0' in qt/qt3dJani Heikkinen2021-01-151-1/+1
| | | | | Change-Id: I84b6b508a3dac5c453d2b4f5de2811e24d143248 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Don't hardcode version number in CMakeLists.txtLi Xinwei2021-01-131-1/+2
| | | | | | | | | | The version number should depend on .cmake.conf. Change-Id: I1ef7713d7dbf3ee5f0abdf7f9d8ff0fb89cdb6dc Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 89ed430fe6e09a5b2f5e75840f51604083ac54f5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump Qt version to 6.0.1 in conanfile.py as wellJani Heikkinen2021-01-131-2/+2
| | | | | | Change-Id: Ib9399fa8f2ff19a5b5ce97bbe69ce495a0bcc3f1 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io> Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* Update dependencies on '6.0' in qt/qt3dJani Heikkinen2021-01-121-4/+4
| | | | | Change-Id: I44262e77605adaffa905a5a5935561a8dfd50ce0 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Add a flag to build the documentationToni Saario2021-01-112-0/+6
| | | | | | | | The Qttools is required for the QDoc for building the docs. Change-Id: I7d300c17042954c7d7e862a6bd89e1d9f6e57497 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit 0c26a37fc0156069b51b7a617a1555d37371f72c)
* Clean up error loggingMike Krus2021-01-111-43/+49
| | | | | | | | | Making it more readable and add details of failed FBO creation. Change-Id: I14a65a5ed6165597acc52f38dc5d1cb908732911 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit 40b663e42c2a53ca1b8dc35f7d8b68516aad85a4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Use correct Y axis orientationMike Krus2021-01-081-1/+1
| | | | | | | Change-Id: I9a4075312db7c385d3ba49176dea8ca0c06061a7 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit 044325863c033c3fb877094f39c1638bc276d87e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Categorise warningsMike Krus2021-01-081-4/+4
| | | | | | | Change-Id: I3b074a02ff47e33472d9506c6dccab281f555e74 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit eee0fca4abc800883dde40559290403e7e550d14) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Bump versionPaul Wicking2021-01-082-2/+2
| | | | | | | Task-number: QTBUG-89789 Change-Id: I60f1bad92c81c295755739f323fcd0af56c72729 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Update dependencies on '6.0' in qt/qt3dJani Heikkinen2021-01-071-3/+3
| | | | | Change-Id: If6b07c0dd19ec47ca3bb163896443822ac3624f4 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Fix sampler2DArrayShadow uniform in QShaderGeneratorJim Albamont2020-12-282-2/+2
| | | | | | | | | Also update the test Change-Id: I23d897f40747192687e632d21aa8fe2f57645909 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit 077b1281ca376a39a5815b112e8e067cdc9165f4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* RHI: compute viewport based on rendertarget sizePaul Lemire2020-12-161-6/+7
| | | | | | | | | | | | So that behavior is consistent with the OpenGL renderer. Computed viewport size is QViewport::normalizedRect * current render target size. If current render target is the window, then its size is the same as the surface size. Change-Id: Icd8f8e18d8959ac045538b493fef690e3dd7221c Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 4794c7543726f2a460c9d16b0ae0154da39efd7c) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Fix qdoc syntax errorNico Vertriest2020-12-161-2/+2
| | | | | | | | | Warning log: qshaderprogram.cpp:253: (qdoc) warning: Missing '\endcode' Change-Id: I63079eef0f277e9c6fd9a718bc40d7fecb5676e6 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 0363d5d84e08ad66826856787e8af57d93a56e6b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update dependencies on '6.0' in qt/qt3dJani Heikkinen2020-12-151-3/+3
| | | | | Change-Id: I51ae2fc7963e3ec4671263ad5352761644516a53 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Clean up configuration of Extras moduleMike Krus2020-12-151-3/+3
| | | | | | | Change-Id: I6ba2720dcda886cc91953f74054ca81ebd52b0df Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit 1d797fccb162d42221b1e4aaa4a8804244976bae) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix plugin names for 3DInputMike Krus2020-12-151-1/+1
| | | | | | | Change-Id: Id80723870cd8b8a3d333c14a98e233d7e87ffab1 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit a57763a3d4277b31657f692b8d5c0b77c8cd7640) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Fix .prl file generationJoerg Bornemann2020-12-151-6/+6
| | | | | | | | | | | | | | | | Work around QTBUG-89467 by re-ordering the add_subdirectory calls in src/CMakeLists.txt. The qmake project file looks correct. It's not entirely clear why pro2cmake generated this particular call order. But by now it's not worth fixing anymore. Also, the .prl file generation should not depend on the order of add_subdirectory calls in the first place. Fixes: QTBUG-89412 Change-Id: I899608d8abe829e1b71ca9aa87734361947137f9 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 1f391d58e84a798e876d1c7d243a3c17566350ef) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix feature names in cmakeMike Krus2020-12-111-14/+14
| | | | | | | | | | | | | | | | | | | | | Feature names were mistakenly changed to use underscores rather than dashes. This breaks builds of apps using qmake as it changes the feature detection symbols. Fixed by reverting to use dashes in the names. This is fine in cmake as dashes are converted to underscores when not quoted. Unfortunately, it changes the command line configuration arguments back to the dashed versions. [ChangeLog] Configuration time command line arguments have changed to use dashes rather than underscores Change-Id: If793c5424aa0459daf06dd075e2e40c33997ca1a Task-number: QTBUG-89386 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit 86eb86514e6b895827e9b73a3bccc057081a470f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix binding of CubeMapArray texturesJim Albamont2020-12-114-6/+113
| | | | | | | | | | | | | | | To bind to a specific face: use glFramebufferTextureLayer and calculate the layer as 6 * layer + face. To bind to a specific cubemap: There is no way in OpenGL to directly bind to an entire cubemap within the array. Instead bind to the entire texture as for a CubeMap with AllFaces. It is up to the drawing code to select the right cubemap and face, 6 * layer + face Change-Id: Ib9e1a598503eeba1fa729677944aba6d799f90b2 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit 94ab90f93dc5338338f30e6d78854b55353d3cb8) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix disabling shader cache via environment variableJim Albamont2020-12-102-1/+3
| | | | | | | | | | | | The tests were a broken too because the QT3D_DISABLE_SHADER_CACHE environment var was still set from the previous test. These tests passed before because the shader builder used the cache if either the QT3D_DISABLE_SHADER_CACHE or QT3D_REBUILD_SHADER_CACHE are not set. Change-Id: Ic04bf3bb8bb7b9b27e3dc9663fe5e96647a3bed4 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit fd5c3299553818e99421f54c1b819681335de9aa) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QShaderProgram: fix documentationPaul Lemire2020-12-101-2/+2
| | | | | | | | | | was using \code instead of \endcode Change-Id: I63794533a3cf2593e9a47fc0b4f97f1b65c88f3f Reviewed-by: Mike Krus <mike.krus@kdab.com> Reviewed-by: Andreas Buhr <andreas.buhr@qt.io> (cherry picked from commit 0f96aa009a6b70e0b79491930fbbd4d3626136b4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Don't include the world for testsMike Krus2020-12-0932-32/+37
| | | | | | | Change-Id: Ib87186571dbf911004d8292e0c0cd9ddaea92318 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit 888ea6487b1c7f68bf6557b2f544079758a58f47) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add documentation for RHI portingPaul Lemire2020-12-073-0/+408
| | | | | | | | | Also add details about GLSL 450 code on the QShaderProgram documentation. Change-Id: I8222984fc655ecf4d7be3d163cdd1d04988c4250 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 34d4aa351bc6e6def71452ab8487fd625cddcdd9) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QShaderProgramBuilder: add documentation related to cachingPaul Lemire2020-12-071-0/+32
| | | | | | | Change-Id: Icdab60d721a0a5186fe3e8844f40e2e448eb94d5 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit cf8688e0ab17f83ad2909431bfae7be209ba7155) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Conan: Fix iOS buildsIikka Eklund2020-12-021-0/+13
| | | | | | | | | | | | | | | | | | | | Conan passes some autodetected iOS related CMake options like CMAKE_SYSTEM_NAME, CMAKE_OSX_ARCHITECTURES, CMAKE_OSX_SYSROOT, which apparently don't work out of the box. - Explicitly pass 'iOS' for CMAKE_SYSTEM_NAME - Remove the explicit sysroot 'CMAKE_OSX_SYSROOT', let CMake detect the sysroots, to ensure that multi-arch builds work. - Remove the conan provided architecture 'CMAKE_OSX_ARCHITECTURES', instead rely on the architectures set by the Qt toolchain file, which with official Qt packages most likely means multi-arch iOS. Task-number: QTBUG-89020 Change-Id: I3c559f00f9391edf68bf88348baae561dc5f0991 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 2ed189225580f49695560b59f4fe341da4444253) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Force command filtering based on frustum culling resultPaul Lemire2020-12-011-2/+5
| | | | | | | Change-Id: I9def719816548d45e1235cb4f65bf0c0d6d0f405 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit f56bc203388866614d8c9f3653c5c835a58ff8d7) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-30 16:52:13 +0000