summaryrefslogtreecommitdiffstats
path: root/src/render/frontend/qshaderprogram.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Do not pass `this` to Private c-torKonstantin Ritt2015-05-201-3/+3
| | | | | | | For classes derived from QNodePrivate, it is not used anymore. Change-Id: I9573042500c2c7533687d251e72bac14cb793525 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Doc: Fix multiple C++ documentation issuesTopi Reinio2015-04-141-0/+5
| | | | | | | | | | | | | | | | | | | - Remove multiple \namespace commands for namespace Qt3D. QDoc in 5.5 is now able to collate namespace members from multiple modules. - Mark 'Q...Private' classes and functions taking private arguments as \internal - Use correct \qtvariable for Qt 3D Core and Render - Add src/plugins directory to Qt 3D Core documentation build to correctly generate Assimp-related documentation. - Ensure documentation for C++ properties is visible by using the \property command instead of documenting the setter/getter functions. - Add export and logging macros to qdoc ignore directives - Remove unnecessary use of \fn command - Language and styling fixes Change-Id: I2481fa30ad2f6869b85c038c20ff1730b8522d46 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
* Make mesh source url resolving compatible with QuickLaszlo Agocs2015-02-131-3/+2
| | | | | | | | The ideal way would be to call the function from QQmlFile but that would need a dependency on the qml module. So just copy the function in. Change-Id: If34d8a2356bbe87b2a011c1c25a79a3f24ebb1ab Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Copyright header change.Mika Salmela2015-02-091-19/+14
| | | | | | | | As for preparation for Qt5.5 release the copyright header is updated to correspond the current license requirements. Change-Id: I36632918b66f455539453b42c369689fb11298ec Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QShaderProgram: remove source file properties, replace by helper methodPaul Lemire2014-10-181-143/+16
| | | | | | | | | | Only the source code QByteArray properties remain. The user is still able to load a shader from a source file by using the shaderFromSource helper method and assigning what it returns to one of the QByteArray source code properties. Change-Id: I5246498fa680ec74d095d7a45f0b1bce239efc13 Task-number: QTBUG-41536 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Have copy() only on QNodeKevin Ottens2014-10-161-17/+17
| | | | | | | | | | It was previously both on QNode and QNodePrivate. The one on QNodePrivate didn't give us much as it didn't eliminate the virtual of QNode. Change-Id: Ia1ea9dd831674109c84bd7005abe7fde3b1223fa Reviewed-by: Paul Lemire <paul.lemire@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Hide doClone implementations behind a macroKevin Ottens2014-10-151-7/+0
| | | | | | | | | This way we will avoid inconsistencies. It also means making some of the copy() implementations more clever. Change-Id: Ic79c9ec7c9c32f8951d5d9f5184592880bf8d5fd Reviewed-by: James Turner <james.turner@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Automate the NodeUpdated notificationsKevin Ottens2014-10-151-22/+0
| | | | | | | | | | | | Now, each time a signal known to be the notification of a property change is emitted, we notify the observers automatically. Properties for which no NOTIFY has been provided are ignored. This change also allowed to drop quite some redundant code in QNode subclasses. Change-Id: Ib4fbeb8311148a6b8789f19ebe437fc7d413a599 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QAbstract removed from corePaul Lemire2014-10-031-4/+4
| | | | | | Task-number: QTBUG-41530 Change-Id: I32ed3d9b819e4e9eafdd36adc30bed9156284777 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QNode refactoringPaul Lemire2014-10-031-48/+44
| | | | | | | | | | | | | | | | Move almost everything to private classes. Assimp loading restored. All examples working. QNode hierachy is now handled through QObject::setParent, addChild, removeChild are part of the private api. Note: commented QChangeArbiter unit tests as they can no longer work with this patch and will restore them when QChangeArbiter will have been made private. Task-number: QTBUG-41470 Task-number: QTBUG-41523 Change-Id: I4430974b3aa7f3744c38714b451b122e0cb4d0c9 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Improved/Refactored cloning and doClone off all subclassesPaul Lemire2014-09-301-2/+5
| | | | | | | | Note: As we are using QScene during cloning, it is important that node hierarchy be created and added in the proper order (parent then child). Change-Id: I8fd53f7ca696ec9aca19cc70dc116ccba4154911 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Add support for remaining shader stages and rename some propertiesSean Harmer2014-09-211-52/+270
| | | | | | | | | | | Examples updated to reflect new QShaderProgram property names. Next commit will add a new example to test the handling of tessellation and geometry shader stages. We need to somehow expose buffers and image units to make use of compute shaders. Change-Id: Idf76cef97a42d5829402c8aa8cc4e288678a3407 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QShaderProgram / RenderShader refactoredPaul Lemire2014-08-141-53/+29
| | | | | | | | | The RenderShader now performs the loading and creation of the actual shader. QShaderProgram is just a container for the sources of the program like it should be. Change-Id: Ida29513deff6970ba3d0f3f020498ed2987d38de Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QShaderProgram implements doClone and copy methodsPaul Lemire2014-08-131-0/+19
| | | | | Change-Id: Ib1534645025e35b9e38665eef84955fd861411db Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* QShaderProgram d-pointeredPaul Lemire2014-07-091-33/+53
| | | | | Change-Id: I96f3f65e371491ce128572dbafbb0f7776a30e5d Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Renamed ShaderProgram to QShaderProgramPaul Lemire2014-07-091-0/+167
Change-Id: I7a9fd824f1975791ee7448023d089e06c34de69d Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 00:45:05 +0000