summaryrefslogtreecommitdiffstats
path: root/src/render/materialsystem
Commit message (Expand)AuthorAgeFilesLines
...
* | | 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
|\| |
| * | ES2 has gl_FragColor and not gl_fragColorKevin Ottens2017-09-271-1/+1
| * | Add phongFunction to the nodes prototypesKevin Ottens2017-09-271-0/+34
| * | Add ES2 rules for the worldSpaceToTangentSpaceMatrix node prototypeKevin Ottens2017-09-271-0/+9
* | | Replace Q_DECL_FINAL with finalKevin Funk2017-09-259-11/+11
* | | Replace Q_DECL_OVERRIDE with overrideKevin Funk2017-09-2519-25/+25
|/ /
* | Merge branch '5.9' into 5.10Sean Harmer2017-09-125-27/+12
|\|
| * Get rid of the AllocationPolicy template argument in the ResourceManagerLars Knoll2017-09-111-1/+0
| * Return the Uniform as a const reference to avoid expensive copiesLars Knoll2017-09-062-12/+2
| * Improve performance of FilterKey comparisonSvenn-Arne Dragly2017-09-062-14/+10
* | New prototypes for QShaderProgramBuilderRenato Araujo Oliveira Filho2017-09-071-0/+135
* | Implement enabledLayers on ShaderBuilderKevin Ottens2017-09-042-1/+27
* | Introduce enabled layers to QShaderProgramBuilderKevin Ottens2017-09-043-0/+34
* | QShaderLanguage to simplify protos and metal/roughKevin Ottens2017-09-041-217/+74
* | Simplify node prototypes JSON using parametersKevin Ottens2017-09-041-226/+93
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-09-011-1/+7
|\|
| * Doc: add doc to undocumented methods qt3dNico Vertriest2017-08-291-1/+7
* | Merge branch '5.9' into devSean Harmer2017-08-191-2/+2
|\|
| * Doc: correct link to TextureNico Vertriest2017-08-021-2/+2
* | Fix: set renderer dirty flag on initializationPaul Lemire2017-07-281-0/+1
* | Merge remote-tracking branch 'origin/5.9' into devAndy Nichols2017-07-111-1/+1
|\|
| * Doc: link errorsNico Vertriest2017-06-201-1/+1
* | Port Metal/Rough materials to shader graphsKevin Ottens2017-07-051-1/+664
* | Shader: factor out the logic to change shader codeKevin Ottens2017-07-052-36/+27
* | Shader: don't mark dirty if code didn't changeKevin Ottens2017-07-051-17/+27
* | Implement code generation in ShaderBuilderKevin Ottens2017-07-055-1/+205
* | Introduce ShaderBuilderKevin Ottens2017-07-053-0/+251
* | Introduce QShaderProgramBuilderKevin Ottens2017-07-054-0/+508
* | QShaderProgram: Remove unused member variablesKevin Ottens2017-06-191-6/+0
* | Merge branch '5.9' into devSean Harmer2017-06-193-3/+6
|\|
| * Add missing private export macrosMike Krus2017-06-163-3/+6
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 02:50:52 +0000