summaryrefslogtreecommitdiffstats
path: root/src/render/materialsystem
Commit message (Expand)AuthorAgeFilesLines
* Add ShaderImage backend nodePaul Lemire2019-06-053-0/+224
* Add QShaderImage frontend classPaul Lemire2019-06-054-0/+1239
* Switch export macros to standard formKai Koehne2019-04-0219-21/+21
* Merge branch '5.12' into 5.13Paul Lemire2019-04-023-51/+21
|\
| * Unify shader include handlingMichael Brasser2019-04-013-51/+21
* | QML: Properly revision new signals and slots in 5.13Kai Koehne2019-03-071-6/+6
* | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-alpha1Qt Forward Merge Bot2019-02-021-2/+2
|\|
| * Doc: Add doc to undocumented methods and properties qt3dNico Vertriest2019-01-241-2/+2
* | QShaderProgramBuilder: add properties to access generated shader codePaul Lemire2018-12-144-0/+213
|/
* Use the correct coordinatesystem include for ES3Michael Brasser2018-12-051-0/+9
* Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-10-051-0/+27
|\
| * Add metalRoughFunction to ES3Mauro Persano2018-09-271-0/+9
| * ES3 deprecated gl_FragColor, use output variable insteadMauro Persano2018-09-271-0/+9
| * Use GLSL texture() instead of texture2D() on ES3Mauro Persano2018-09-271-0/+9
* | Add private export to GraphicsApiFilterDatav5.12.0-beta1Svenn-Arne Dragly2018-10-021-1/+1
* | Privately export ShaderBuilderPaul Lemire2018-08-291-1/+1
|/
* QGraphicsApiFilter: fix Vulkan enum value aliasingPaul Lemire2018-06-251-4/+4
* Doc: Add missing dots (qt3d)Paul Wicking2018-06-191-2/+2
* Doc: Fix documentation warnings related to Clang QDoc parserTopi Reinio2018-04-201-0/+2
* Doc: Add and improve examples in render states and material systemSvenn-Arne Dragly2018-03-252-19/+29
* AbstractRenderer: add entries into API enumPaul Lemire2018-03-191-1/+3
* Move Renderer specific classes into new folderPaul Lemire2018-03-191-1/+0
* Prevent readded shaders to be purged from cacheAnders Hafreager2018-02-281-0/+2
* Doc: Fix documentation warnings for Qt 3D RenderTopi Reinio2018-02-281-10/+3
* QParameter: add bookkeeping of QNode valuesPaul Lemire2018-02-211-0/+9
* Merge remote-tracking branch 'origin/5.10' into 5.11Sean Harmer2018-02-155-20/+47
|\
| * Merge remote-tracking branch 'origin/5.9' into 5.10Sean Harmer2018-02-053-10/+37
| |\
| | * Fix array of textures in shader parameterMauro Persano2018-02-021-5/+22
| | * Compile failing shaders once only and avoid asserting on failureLaszlo Agocs2018-02-012-5/+15
| * | Render: Use SIMD Vectors and Matrices in the backendPaul Lemire2018-02-022-10/+10
* | | Merge remote-tracking branch 'origin/5.10.1' into 5.11Liang Qi2018-02-141-8/+18
|\| |
| * | Fix OnDemand render policySvenn-Arne Dragly2018-02-011-8/+18
* | | Merge branch '5.10' into devSean Harmer2018-01-179-17/+16
|\| |
| * | Prevent use of temporary containersMike Krus2018-01-131-6/+6
| * | Merge branch '5.9' into 5.10Sean Harmer2018-01-128-11/+10
| |\|
| | * Get rid of the INDEXBITS template argument for QHandleLars Knoll2017-12-131-1/+0
| | * Fix includes of Qt classesFriedemann Kleint2017-11-237-10/+10
* | | Merge remote-tracking branch 'origin/5.10' into devLaszlo Agocs2017-12-132-0/+250
|\| |
| * | Merge remote-tracking branch 'origin/5.10.0' into 5.10Liang Qi2017-12-081-0/+8
| |\ \
| | * \ Merge 5.10 into 5.10.0Oswald Buddenhagen2017-11-202-2/+5
| | |\ \
| | * | | Fix resource init namespace issuesLaszlo Agocs2017-11-141-3/+8
| | * | | Fix material system qrc in static buildsLaszlo Agocs2017-11-081-0/+3
| * | | | Fix doc in QShaderProgramPaul Lemire2017-11-231-2/+2
| * | | | QShaderProgram: document the default uniformsPaul Lemire2017-11-221-0/+242
| | |/ / | |/| |
* | | | Merge remote-tracking branch 'origin/5.10' into devAndy Nichols2017-11-202-2/+5
|\| | |
| * | | Merge "Merge remote-tracking branch 'origin/5.9' into 5.10" into refs/staging...Laszlo Agocs2017-11-181-1/+4
| |\ \ \
| | * \ \ Merge remote-tracking branch 'origin/5.9' into 5.10Andy Nichols2017-11-171-1/+4
| | |\ \ \ | | | |/ / | | |/| / | | | |/
| | | * Material dirty only on param name/enabled changeSvenn-Arne Dragly2017-11-151-1/+4
| * | | Use texture() GLSL function rather than texture2D() in core profileSean Harmer2017-11-171-1/+1
| |/ /
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2017-10-051-1/+44
|\| |