summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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 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>
* 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>
* 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>
* 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 qt/qtquick3d-assimp submoduleJani Heikkinen2021-01-181-0/+0
| | | | | | | Fixes: QTBUG-89433 Pick-to: dev Change-Id: Iec372c94b541f871f3ed78843656c2dfa1a1f613 Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* 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>
* Fix sampler2DArrayShadow uniform in QShaderGeneratorJim Albamont2020-12-281-1/+1
| | | | | | | | | 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>
* 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-113-6/+6
| | | | | | | | | | | | | | | 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-101-1/+1
| | | | | | | | | | | | 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>
* 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>
* 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>
* Fix deadlock when running with QT3D_MAX_THREAD_COUNT=1Paul Lemire2020-12-0111-66/+30
| | | | | | | | | | Also remove duplication and make QAspectJobManager::idealThreadCount the centralized function to retrieve expect maximum number of threads. Change-Id: Iec8d65d368ac7825ef87e883a987551726603adc Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 9ef97eaee6a1e795f0e5c2af7df29148914fb1b3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* OpenGL renderer: fix use of outdated VAO when shader is reloadedPaul Lemire2020-12-013-7/+27
| | | | | | | | | | | | | | | | | In a case where an existing shader was updated, VAO previously associated with the shader wouldn't be updated properly. To account for this, we now release all VAOs associated with a shader when loading a shader. Additionally we also skip VAO creation of commands referencing a shader that was loaded in the current frame. The reason for that is we know the command for that VAO is not completed. Qt3D requires a first frame to load a shader + perform introspection and creates valid command against shader only on the following frame. Change-Id: I36f89fdd78e857dc5bc4af3b539d3b32630dfad6 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 7f1bcdb799ad689fc138f976eed7e12f1ce64386) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* RHI: restore QBufferCapture featurePaul Lemire2020-12-012-8/+5
| | | | | | | | | | Also fix manual test to import Qt3D.Core 2.9 since QBuffer was moved to core in Qt 6 and accessType property was introduce with revision 9. Change-Id: I449f413fd161fe4660cef61708cd641e429c1c81 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 10adc1c93c80dba4535a3cf22c5095d788ae0a43) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add RHI technique for distance field rendererMike Krus2020-11-302-0/+21
| | | | | | | Change-Id: Ia69dceb8ade566c2b67ce681b7b554e0babb17f2 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit 4e248d8d0229f8afa283e9e9fe57f54a92bf4477) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* RHI: handle uniforms of type arrays properlyPaul Lemire2020-11-283-1/+37
| | | | | | | | | | | | | | | | | | | | We weren't handling the possible array stride for uniform arrays. For a float[8], the GPU might expect each float to fit in a vec4 slot. We therefore have to handle that when uploading the values otherwise we could end having data in what the GPU believe is padding data. This required modifying the UniformValue object to report the number of elements it contains as it might not necessarely be the same as the array dimension reported by the shader introspection. Note: it seems that the arrayStride might not be reported properly. To work around that, if we know we are dealing with an array, we compute the stride ourselves. Change-Id: I12b5379927dd47be888a40db58c2e5aba6e0730b Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit cf6b181227b02b23050198d21c54bd03eacd3b55) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Allow assimp to compile on non-gcc compilersJoni Poikelin2020-11-271-1/+1
| | | | | | | | | | | Gcc 4 version check can also be dropped since it is not supported anymore. Fixes: QTBUG-88821 Change-Id: Ice522afc92823156e9545e8e75b16c2c0a614d6f Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit c6716fa7f044985389038802a296bae83951b119) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Only set the state flag after having merged with the other statesPaul Lemire2020-11-271-1/+1
| | | | | | | Change-Id: Ic7a0a2cccb2b131eec7fca3cf7324109b4d22b6b Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 6df7098d89cf4a2eec35fe1362d354c91eb7a4ef) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Scene3D: handle flipping based on the RHI backend in usePaul Lemire2020-11-265-3/+28
| | | | | | | | | | | | | | | | Qt3D handles flipping based on whether the RHI backend in use requires it or not. Scene3D would also flip the content (ignoring the fact that the content was already in the correct orientation). This resulted in cases where a Qt 3D scene rendered with Scene3D would be flipped while the same scene rendered on its own (with Qt3DWindow) would be correct. Change-Id: I9fc2a01f63713ed3dbafaf896dfd9457d7160653 Task-number: QTBUG-87842 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit af56e7966d523714a3d64c0780fc266175431fd1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Use RHI's clipSpaceCorrMatrix for backend where Y is not upPaul Lemire2020-11-2611-13/+29
| | | | | | | | | | | | | | | It's better to rely on RHI instead of a hard coded matrix. Also modify the UBO to provide the clipSpaceCorrectionMatrix and the uncorrected projectionMatrix. All the other matrices we compute and provide use the corrected projectionMatrix but these two new matrices give users the libertity of bypassing the correction if they need to. Change-Id: I52e409cc9b38ea0e939d19d92e2ddd907aa7d1cb Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 9c682cf8ffe302719df1202d89e560e4fe67739d) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Clean up qml type handlingMike Krus2020-11-264-1251/+498
| | | | | | | | | Was duplicated code Change-Id: If20893a53bd75784fb8a268573f39b25c53d3f7d Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit 4ba87fb9477e7143f3620f84ec51bd1ad9985588) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QShaderProgram: handle binding = auto replacement for raw shader codePaul Lemire2020-11-264-48/+80
| | | | | | | | | | | | | | | | binding = auto replacement only took place when using shader graphs. This meant providing shader code that used binding = auto or that included snippets that themselves used binding = auto (such as phong.inc.frag) would fail. For that reason, that replacement was moved from the shadergraph builder to QShaderProgramPrivate so that it can be used for both cases: raw shader code or shader graphs. Change-Id: I298a82b83b1181d7a0f19a2e2fefc3aeb9eb81c4 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 1e2902ba3e1285fb2db5a90712135b130fdbbb84) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* CMake: Build docs for Qt 3DTopi Reinio2020-11-2644-102/+82
| | | | | | | | | | | In order to pass correct Qt include paths to QDoc's Clang-based C++ parser, move the documentation project to be under src/core. Fixes: QTBUG-88838 Change-Id: Ie1608eb295d94f20ef0089f73f3df1aceb566c14 Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 44cae613ffa934cc358b97994a65c54a9bc2d8a6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Fix documentation warningsTopi Reinio2020-11-2520-191/+82
| | | | | | | | Fixes: QTBUG-88842 Change-Id: Ie8ea1914c5e740c0c4bf25f4754a008aff6401cd Reviewed-by: Paul Wicking <paul.wicking@qt.io> (cherry picked from commit 2687a8b3c0428f0da71bef05324dfbdd3581fc20) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* QAbstractTexture: expose mipLevelPaul Lemire2020-11-243-1/+30
| | | | | | | | | This is supposed to be exposed for Qt6 Change-Id: I3fefcd706ca16328946f33d665055dfe2a4c3563 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 5457ad2a0a58157c2ba7aa77c73d4b22883e4d0b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* RHI: handle compute commandsPaul Lemire2020-11-243-153/+61
| | | | | | | | | | | | | Remove comments which don't apply and empty performDraw command which was not used. Note: we have no easy way of knowing when a SSBO is also bound as a VertexBuffer. This forces us to set both flags. Change-Id: I39988978a5cad0e0507bbc91e978b44cb2037003 Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 41ddcab8d568f61179dbd5dcd95f09807c02aa57) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Handle fallout from QEvent loosing it's copy constructorMike Krus2020-11-2411-79/+59
| | | | | | | | Task-number: QTBUG-88757 Change-Id: I5097faecd2e895d4685a4cc57a4e2a5c079f2255 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit d826238b65b0ebd8034900224b382bd85e6add27) Reviewed-by: Mike Krus <mike.krus@kdab.com>
* RHI: add attr name/type when issuing warning about unsupported typePaul Lemire2020-11-231-1/+1
| | | | | | | Change-Id: I2f9eceb51d19dcd048036ee383fa3bab4e0678ff Reviewed-by: Mike Krus <mike.krus@kdab.com> (cherry picked from commit 34e3fa58dcd1b746e0f890b6a78823f8cfee9b12) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Follow up on change of QQmlListProperty to qsizetypeMike Krus2020-11-2362-170/+169
| | | | | | | | | | Also update dependencies and fix non-gui builds. Disabled (for now) gltf unit test since JSON parser seems to crash. Change-Id: I1aceb20d698e962e70103a92781fa7b646db86b3 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit 679f7c4988c75bc9d2cff450af0df842b955e22f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update qmake to match configuration flag changesMike Krus2020-11-233-9/+9
| | | | | | | Change-Id: I679c7d96002b1f58c7ae54fd3bfe044e395a0ed4 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit c093cad12472b6151e2a3e194202d01568a7588f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update documentationMike Krus2020-11-232-8/+54
| | | | | | | Change-Id: I20195e764ee33ec6c8af3ded2ff7ec84c6ac3eb1 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit fb687161002474d20772a594f7e61cf927443919) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Update attributionsMike Krus2020-11-231-1/+1
| | | | | | | Change-Id: I24a9296314b119f8a1ebec07571f41341ce48858 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit c840677af00722a3f680a20114d4c94865bb223a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix deprecated API usage and compile warningsMike Krus2020-11-2338-149/+131
| | | | | | | | | | | - QVariant::Type deprecated, use QMetaType related APIs - QNodeId not used as reference in for loops (nop but really noisy) - some unused code Change-Id: I08f72181ae6eeb369ca41015a21813cd7bf05231 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> (cherry picked from commit 490fa176b69a390ce13168ae6c87623449b36d88) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Rename "Porting" pages to "Changes"Jerome Pasion2020-11-092-2/+2
| | | | | | | | | | | | | | The content in the porting guides are closer to a changelog than a porting guide. At this point, it is easier for maintainers and contributors to write in a changelog than a guide. This change should help with readability and is closer to the usage of "Changes" in documentation. Part of a rename in other submodules. Task-number: QTBUG-87156 Change-Id: I10b2aaebfb49d1e289d663ddff042425ce772991 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Normalise configuration nameMike Krus2020-11-093-19/+19
| | | | | | | All others use qt3d_ prefix Change-Id: Id0405591a0fcfe62c8a510c9c226e85190d9a4cf Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Add mipmaps count to QAbstracTexturePrivateJuan José Casafranca2020-11-053-0/+3
| | | | | | Pick-to: 5.15 Change-Id: Iaec05eb3d7d8647af14d2e155673dd25c3dae994 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Fix taking pending texture data updatesJuan José Casafranca2020-11-051-1/+2
| | | | | Change-Id: Iea9fee79797bf005938d13436d83726c1c7c837a Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 18:58:07 +0000