summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.8' into devwip/particlesLiang Qi2016-09-23124-2363/+5748
|\ | | | | | | Change-Id: I4e1c528eb8e1c81aead51a5664635ca2becad397
| * Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-09-2042-894/+2065
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/render/framegraph/qrendersurfaceselector.cpp src/render/frontend/qrendersettings.cpp src/render/jobs/renderviewjobutils_p.h tests/auto/render/render.pro Change-Id: Ibe9eb962e3990e07f01a5608a2d60c79bc4c160f
| | * QTechnique fix: was sending wrong change typePaul Lemire2016-09-191-1/+1
| | | | | | | | | | | | | | | | | | Change-Id: Ide125bd292f10d2363cd0928af2513efe9f25eaf Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| | * Update QClearbuffers docsAntti Määttä2016-09-091-25/+31
| | | | | | | | | | | | | | | Change-Id: I1209a4ec7c0775e16debbce864e965eb3df13771 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| | * Fix QCameraLens moduleAntti Määttä2016-09-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's in render module not in core. Change-Id: Ic42b65c365308915e38a42561f167f81d30c3b72 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| | * Fix non-symmetric extents and resolutions for QCuboidMeshMiikka Heikkinen2016-09-082-29/+185
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-55836 Change-Id: Ic5ee72f5ffb236fe15e46fa667159a139ad05b03 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| | * ShaderData: add getter to retrieve transform type of propertiesPaul Lemire2016-09-074-21/+26
| | | | | | | | | | | | | | | | | | | | | | | | Replaces isPropertyToBeTransformed by propertyTransformType which returns the TransformType (NoTransform) if the property isn't transformed. Change-Id: Ib7d91bdcfe18409e6ad6d6f5bc119c46dd7fb143 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| | * Add unit tests for LoadSceneJobPaul Lemire2016-09-073-1/+301
| | | | | | | | | | | | | | | Change-Id: I6a570f16a303277b8305b36bef805991680ae1ea Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| | * LoadSceneJob: set the status after the subtreePaul Lemire2016-09-071-7/+9
| | | | | | | | | | | | | | | | | | | | | Change-Id: I826e599bf188162eaa4b2bed1ce34741192d05b9 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
| | * Update QRenderPass docsAntti Määttä2016-09-062-41/+75
| | | | | | | | | | | | | | | Change-Id: I62bcba620c3d222fc6d26151b21c0de1e196fc8d Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| | * ShaderData: refactoringPaul Lemire2016-09-056-140/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only store the original properties (does not store transformed values anymore as these can change on a per thread basis and lead to races in the ShaderData). Instead introduce a method to check if a property needs to be transformed and a method which given a viewMatrix returns the transformed value. This can then be used concurrently by each UniformBlockValueBuilder without introducing races. Also since building UBO from a ShaderData has been disabled since 5.7, remove all the nested ShaderData update logic. Unit tests updated. Change-Id: Id0e5956b9f7d93f8d019c3d8999268fc3ad68e79 Task-number: QTBUG-54818 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
| | * Update QTechnique docsAntti Määttä2016-09-051-31/+59
| | | | | | | | | | | | | | | | | | Change-Id: I5345954047540ef1d03ba42841bfca221cc35b7e Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| | * Update QMaterial docsMiikka Heikkinen2016-09-051-38/+42
| | | | | | | | | | | | | | | Change-Id: Ib1e5304f96f1d39615102f72584f54dba2586e6c Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| | * Update QShaderProgram docsMiikka Heikkinen2016-09-051-65/+74
| | | | | | | | | | | | | | | | | | Change-Id: I733333e6c707d590218fd5b19722e08908e52b49 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| | * Update QFilterKey docsMiikka Heikkinen2016-09-051-16/+24
| | | | | | | | | | | | | | | | | | Change-Id: Id6bb471e11de2bf8b33cec603d382f079d0b0e79 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| | * Fix documentation of QRenderSettings and QPickingSettingsMiikka Heikkinen2016-09-052-52/+133
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-55697 Change-Id: I7a357f6f00b62c1ef2042f4088374dcd34005110 Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| | * Update QEffect docsMiikka Heikkinen2016-09-051-11/+29
| | | | | | | | | | | | | | | Change-Id: I9266413eec2e23457198016cc63be8aaebab3db0 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| | * Improve QInputSettings docsMiikka Heikkinen2016-09-051-34/+22
| | | | | | | | | | | | | | | Change-Id: I583cca3c0af117b97465f84190663908877d51b0 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| | * Update QMouseDevice docsAntti Määttä2016-09-051-23/+40
| | | | | | | | | | | | | | | Change-Id: I6739fb95ed549fa02e9308d89e695f028fec4ed7 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| | * Update QFrameAction docsAntti Määttä2016-09-051-8/+18
| | | | | | | | | | | | | | | | | | Change-Id: I4bcde9ed1e1ab8a9d127dd1d4c75d30f8c342641 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| | * Update QCameraSelector docsAntti Määttä2016-09-051-14/+24
| | | | | | | | | | | | | | | | | | Change-Id: I349f40e488465a147970f1d52696cf1fa9e22063 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| | * Update QSortPolicy docsAntti Määttä2016-09-051-26/+37
| | | | | | | | | | | | | | | | | | Change-Id: I28f5d587d81b8c6f2263b68325847872df40e0c3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| | * Update QFrameGraphNode docsAntti Määttä2016-09-051-10/+99
| | | | | | | | | | | | | | | | | | Change-Id: I3d974b7ab1f5e0b829b139c71a1469fe35dd5ec1 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| | * Update QCameraLens docsAntti Määttä2016-09-051-125/+162
| | | | | | | | | | | | | | | | | | Change-Id: I3e2cd85d5c85b066fdcf7793adbc969092fc7736 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| | * Update QSceneLoader docsAntti Määttä2016-09-051-54/+76
| | | | | | | | | | | | | | | | | | Change-Id: Idb4210e9d455c9b8c87a6540d486992531778c0e Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| | * Update QViewport docsAntti Määttä2016-09-051-22/+32
| | | | | | | | | | | | | | | | | | Change-Id: I9a81ddc741af8fb0f1126b431763ccf7a1f07e3a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| | * Fix QForwardRenderer docsMiikka Heikkinen2016-09-051-29/+70
| | | | | | | | | | | | | | | Change-Id: Ic9fcfa41caa8773a1fa12fa42c6345292ae6160e Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| | * Fix camera controllersMiikka Heikkinen2016-09-055-16/+295
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed a few bugs and inconsistencies between qml and c++ implementations of the camera controllers. Also documented them. Task-number: QTBUG-55697 Change-Id: Ie490b0ca46f60a2a34c04f91572505e908ce65ba Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| | * Remove excess slashes from include statementsMiikka Heikkinen2016-09-053-5/+5
| | | | | | | | | | | | | | | Change-Id: I64f815587947ad2f63462bb38027c533c7aa4bdc Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| | * Update QLayerFilter docsAntti Määttä2016-09-051-15/+17
| | | | | | | | | | | | | | | | | | Change-Id: I4715d22a583f16444ea9f35c6f9352d53e63f114 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| | * Update QRenderSurfaceSelector docsAntti Määttä2016-09-051-33/+59
| | | | | | | | | | | | | | | | | | Change-Id: I8022413e6d6b7bcda469a7a5ec569f7af0cefd1f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * | Renamed files quniformvalue* to shaderparameterpackPaul Lemire2016-09-168-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | These files contains a class named ShaderParameterPack so filenames needed to be adjusted. Change-Id: I8735c753e2a741a6238780b40fb42143d4439e09 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * | GraphicsContext/Helpers: remove bindUniformPaul Lemire2016-09-1415-742/+7
| | | | | | | | | | | | | | | | | | | | | | | | Replaced by applyUniform and the various glUniform*v helpers Change-Id: Ibfb2daa1268ac2eee299e774d9b5d4e2f5b6bc74 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * | Parameter: only store a UniformValuePaul Lemire2016-09-142-9/+0
| | | | | | | | | | | | | | | | | | Change-Id: I6614c05fabb4fde72973a0e4738eb86efad7cc14 Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * | Renderer: get rid of QVariant for backend uniformsPaul Lemire2016-09-149-243/+203
| | | | | | | | | | | | | | | Change-Id: Ib4d6f178ec2f6bb19f26e09ad74ba77d2c752627 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * | MouseDevice: add wheel axes handlingPaul Lemire2016-09-083-1/+23
| | | | | | | | | | | | | | | | | | Change-Id: Ie2a7c3e6e4c5ec10358bac70055c28fa81bbc117 Task-number: QTBUG-54620 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * | Add Wheel axes to QMouseDevicePaul Lemire2016-09-082-5/+14
| | | | | | | | | | | | | | | | | | Change-Id: Ie56e95cfe388e5297e41d181fc6dbbd25ac81171 Task-number: QTBUG-54620 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * | GraphicsHelperGL3_3: small fixes + autotest exportPaul Lemire2016-09-082-1/+19
| | | | | | | | | | | | | | | Change-Id: I3f37b88df6c3869570c0466e85e52a8e29387d92 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * | GraphicsHelperGL4: add missing supported featuresPaul Lemire2016-09-081-0/+2
| | | | | | | | | | | | | | | Change-Id: If388d6de30794fb444e82bc7abad25bf14f53d75 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * | UniformType: add Q_DECLARE_METATYPE for unit testsPaul Lemire2016-09-081-0/+2
| | | | | | | | | | | | | | | Change-Id: I927b67c75eca279e166ab7e37a7d1c3206856ec1 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| * | GraphicHelpers: add helper methods to get UniformType from GLTypePaul Lemire2016-09-0711-0/+366
| | | | | | | | | | | | | | | Change-Id: I7711345d4c9b9b9d2e542a57bae7151bc4fcec84 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * | GraphicsHelperGL2: fix code indentationPaul Lemire2016-09-071-11/+11
| | | | | | | | | | | | | | | Change-Id: I02a1feb4206e1e01b358f3b609d624d0ae435ba4 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * | Parameter: store a UniformValuePaul Lemire2016-09-072-0/+10
| | | | | | | | | | | | | | | | | | | | | Should soon allow to get rid of QVariant Change-Id: I85b37fd013523eecdccb747d2835b5d25145022a Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * | GraphicsContext: add methods to use UniformValuePaul Lemire2016-09-072-0/+81
| | | | | | | | | | | | | | | Change-Id: I0f4062639ed901ac1fe206b940d2fb32c2feed05 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * | Unit tests for UniformValuePaul Lemire2016-09-073-1/+307
| | | | | | | | | | | | | | | Change-Id: I5cd96122a29a2e74e2576cd6f812234e94ecaf99 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * | Add UniformValue classSean Harmer2016-09-073-2/+374
| | | | | | | | | | | | | | | | | | | | | | | | Provides a generic container for Uniform values that will allow to replace QVariant in the backend and make processing therefore much faster. Change-Id: I689d8505594732e786a66a76cea71b2528563df6 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| * | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-09-0544-433/+2116
| |\| | | | | | | | | | | | | | | | | | | Conflicts: tests/manual/manual.pro Change-Id: Ie1186d3465516d8d50b8261f72e64d8d454d377b
| | * Update QEntity docsAntti Määttä2016-09-022-26/+45
| | | | | | | | | | | | | | | | | | Change-Id: I4a28761474d961d39074490e12f21b3d0c7ac911 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| | * Update QTextureImage docsAntti Määttä2016-09-023-21/+137
| | | | | | | | | | | | | | | | | | | | | | | | Update QTextureImage docs and add documentation for QTextureImageDataGenerator and QAbstractFunctor Change-Id: Ia2067ee5ee9283727f4f37e342068a02eda4a901 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
| | * Remove unimplemented function from QBlendEquationArgumentsMiikka Heikkinen2016-09-021-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | QBlendEquationArguments::specifiesAllDrawBuffers() has no implementation, so it shouldn't exist. Change-Id: I76a73d4712572e3b1cf675b195c675a033bdc670 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-14 02:50:32 +0000