summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update dependencies on 'dev' in qt/qtshadertoolsHEADdevQt Submodule Update Bot18 hours1-1/+1
| | | | | Change-Id: I9e80afffdc9ddf809420080d9c2f33354991561d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtshadertoolsQt Submodule Update Bot24 hours1-1/+1
| | | | | Change-Id: Id140276ce41e608e84d2ba0115c8475cb61595e6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtshadertoolsQt Submodule Update Bot4 days1-1/+1
| | | | | Change-Id: I6ada94da77ad2ba9b4c0acd69fafdc7a657ec58d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtshadertoolsQt Submodule Update Bot8 days1-1/+1
| | | | | Change-Id: Iccc509f4fcb7ce1620d392aa7b8ba8e62724da33 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtshadertoolsQt Submodule Update Bot10 days1-1/+1
| | | | | Change-Id: I50a115b6fef14613ba5b4ca15e45dd7973c339d3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtshadertoolsQt Submodule Update Bot2024-05-091-1/+1
| | | | | Change-Id: If30dadbe40deeabf308ddcf35d1091765a9a0746 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtshadertoolsQt Submodule Update Bot2024-05-071-1/+1
| | | | | Change-Id: I655217f6b622db44b2f641a3ceef1bfa37d1d572 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtshadertoolsQt Submodule Update Bot2024-05-031-1/+1
| | | | | Change-Id: Ica56e866c2cb8a2608cecae9b1e5d7edf1b5eeef Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtshadertoolsQt Submodule Update Bot2024-05-021-1/+1
| | | | | Change-Id: Id1b836bcf601d841b9c51f9651c9f389e32daeda Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtshadertoolsQt Submodule Update Bot2024-04-291-1/+1
| | | | | Change-Id: I29e4c4e07faa31446cec9901864662fbca855eda Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtshadertoolsQt Submodule Update Bot2024-04-241-1/+1
| | | | | Change-Id: If7346823b952744bc5c2cc364055640bb96fb679 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtshadertoolsQt Submodule Update Bot2024-04-191-1/+1
| | | | | Change-Id: I83c021fcce0d11bd6ac78388256aa939d45edfd6 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtshadertoolsQt Submodule Update Bot2024-04-171-1/+1
| | | | | Change-Id: Ie4cf5f7649c8c48f3961a47f8b7ae0990ea90f1c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Clarify multiview docs for qsbLaszlo Agocs2024-04-162-16/+27
| | | | | | | ...and update for 6.8 in general. Change-Id: I5150ca362de98781caf4fd08afa21a2e62061da8 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* Only inject enabling GL_EXT_multiview for vertex shadersLaszlo Agocs2024-04-162-1/+20
| | | | | | | | | | According to SPIRV-Cross, GL_OVR_multiview2 can only be used with vertex shaders, and it refuses transpiling to GLSL if gl_ViewIndex is used in a fragment shader. If this is correct, that is unclear. In any case, the behavior in QShaderBaker should be unified, we already check for VertexStage in some places when it comes to multiview, but not where the GL_EXT_multiview enable line gets injected. Do this only for vertex shaders, but keep our own QSHADER_VIEW_COUNT define working in fragment shaders too. This way if one tries to use gl_ViewIndex in a fragment shader, they get a much more clear error, compared to now. To be fair, this is in line with what the qsb help text already says. Change-Id: Idf8f4255efb91ce93412783b7bf5548798188099 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* Update dependencies on 'dev' in qt/qtshadertoolsQt Submodule Update Bot2024-04-151-1/+1
| | | | | Change-Id: Ia15680322c5f25308c17fbeada5a43aaba727cc9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtshadertoolsQt Submodule Update Bot2024-04-101-1/+1
| | | | | Change-Id: I7f1c97227c57e110924dbf8b9985283928d620e3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtshadertoolsQt Submodule Update Bot2024-04-091-1/+1
| | | | | Change-Id: I56bdea8b10ce3a090b9d618c86932e615a094d51 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtshadertoolsQt Submodule Update Bot2024-04-081-1/+1
| | | | | Change-Id: I655c9d6d1c4838fda1bf77f28128cf8d1a0e231d Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Change license for test filesLucie Gérard2024-04-045-5/+5
| | | | | | | | | | | | According to QUIP-18 [1], all test files should be LicenseRef-Qt-Commercial OR GPL-3.0-only [1]: https://contribute.qt-project.org/quips/18 Pick-to: 6.7 Task-number: QTBUG-121787 Change-Id: I9bb9e1455afc01577e0f591a73633579cbc146e6 Reviewed-by: Kai Köhne <kai.koehne@qt.io>
* Add a licenseRule.json file for checking of SPDX license identifiersLucie Gérard2024-04-041-0/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The license test in qtqa reads this file in order to check the validity of the license used. This file reproduce the QUIP-18 [1] rules, with some exceptions. Each entry in the file corresponds to a set of licensing rules. A set of licensing rules can depend on the file ending, registered in "file_pattern_ending". The last entry in the file has no "file_pattern_ending", it sets the rules for the files whose licensing does not depend on their ending. The license to be used depends on the location of the file within the Qt module repository. Let's call this "<true_location>". The "<true_location>" can also correspond to a file name, offering flexibility for exceptions to the rule. The "<true_location>" are registered in "location". For each "<true_location>" there is a "file type" entry and a "spdx" entry. The "spdx" entry gives the rule: the expected license tag(s) in SPDX format for the file ending (if applicable) and "<true_location>". The "file type" informs on the QUIP-18 type the tested file corresponds to. It is purely informational for the reader. The set of rules are tested in order of appearance in the json file. For this reason, a more constraining ending (like "special.txt") needs to appear in a "file_pattern_ending" located before the "file_pattern_ending" of a less constraining ending (like ".txt"). Also, a file ending cannot be present in two "file_pattern_ending". "file_pattern_ending" and "spdx" should list strings. "<true_location>" can be regular expressions. During the test the deeper "<true_location>" are checked first. The order is which they appear in the json file does not matter. To test this file, run QT_MODULE_TO_TEST=../qtshadertools perl tests/prebuild/license/tst_licenses.pl [1]: https://contribute.qt-project.org/quips/18 Pick-to: 6.7 Task-number: QTBUG-121039 Change-Id: I697234fa2ccc969e95d1c3b96b94464764f5efc3 Reviewed-by: Kai Köhne <kai.koehne@qt.io>
* Update dependencies on 'dev' in qt/qtshadertoolsQt Submodule Update Bot2024-04-041-1/+1
| | | | | Change-Id: I05ab50a90db62db9e9109e0f7f9e0ad8eea6f711 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtshadertoolsQt Submodule Update Bot2024-03-281-1/+1
| | | | | Change-Id: I768d67e3c51490ee7507e693b596d40099128d4c Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtshadertoolsQt Submodule Update Bot2024-03-251-1/+1
| | | | | Change-Id: I367f68f3942eec8f32db9036d9f1104217dca7d8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtshadertoolsQt Submodule Update Bot2024-03-251-1/+1
| | | | | Change-Id: I65b53160f1e6ecfbf803e67c8eb8a74d57ff38f9 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtshadertoolsQt Submodule Update Bot2024-03-211-1/+1
| | | | | Change-Id: Ib3751fc8cc6b7c1e2cdeead9034c10ba32b7f87a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Change classification of NVIDIA licenseKai Köhne2024-03-191-2/+2
| | | | | | | | | [ChangeLog][Third-Party Code] Re-classify previous custom nvidia license as AML-glslang, as introduced by the newest SPDX version. Pick-to: 6.7 Change-Id: I69490b6e8fb40a1ff4197f5dd9dca7e54196d944 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Update dependencies on 'dev' in qt/qtshadertoolsQt Submodule Update Bot2024-03-171-1/+1
| | | | | Change-Id: Iec6a0b4e1d335edc8344fa3b6cf053120efff7d3 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtshadertoolsQt Submodule Update Bot2024-03-161-1/+1
| | | | | Change-Id: Ic64f0a7747e07ff05b7deb18bd9b729a6b996bb0 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtshadertoolsQt Submodule Update Bot2024-03-141-1/+1
| | | | | Change-Id: Iaa6b28eaf446cd2e5ced81f0a5c4f8789671516a Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtshadertoolsQt Submodule Update Bot2024-03-131-1/+1
| | | | | Change-Id: Ide19861ce417dc77ae373074374d5f350597c757 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtshadertoolsQt Submodule Update Bot2024-03-101-1/+1
| | | | | Change-Id: I062b453ce92e9747b970371b335cbe5414a26e6f Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtshadertoolsQt Submodule Update Bot2024-03-021-1/+1
| | | | | Change-Id: I019a148f3a2792a6e22aaf655b09eccb1e51303e Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Add depfile support to qsbAlexey Edelev2024-02-2817-0/+321
| | | | | | | | | | | | | This adds the new option '--depfile' to qsb tool. The tool now supports generating of gcc depfiles based on the '#include' statements found in the shader files. The generated depfile it then passed to the CMake add_custom_command command that calls qsb to control changes in the shader includes. Change-Id: I6330fbaaef35cb294f1e3ce7a3054f836fe986db Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jøger Hansegård <joger.hansegard@qt.io>
* Update dependencies on 'dev' in qt/qtshadertoolsQt Submodule Update Bot2024-02-271-1/+1
| | | | | Change-Id: Id1e703675a3c4ef64ca28d48f32e8231d4040633 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtshadertoolsQt Submodule Update Bot2024-02-221-1/+1
| | | | | Change-Id: Ia8a3811dac8a804cc4a705969d80db4208396a27 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtshadertoolsQt Submodule Update Bot2024-02-211-1/+1
| | | | | Change-Id: I486515590ef62acf6751eda1072c4a95b36c7c64 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtshadertoolsQt Submodule Update Bot2024-02-191-1/+1
| | | | | Change-Id: Iacb88cfb13bb3cb6ce8aad741faabe76c5775559 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtshadertoolsQt Submodule Update Bot2024-02-101-1/+1
| | | | | Change-Id: I1e59bfa4ac1e200d46c8676f6d29d908966839c1 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtshadertoolsQt Submodule Update Bot2024-02-091-1/+1
| | | | | Change-Id: I87effb0252b77f0923be928ed68cd064a4a54fef Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtshadertoolsQt Submodule Update Bot2024-02-061-1/+1
| | | | | Change-Id: I8a5a038927e813550943304da87708b509a17ab8 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtshadertoolsQt Submodule Update Bot2024-01-311-1/+1
| | | | | Change-Id: I343a63ca0de55162403bbc47a0ebdc8940383076 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtshadertoolsQt Submodule Update Bot2024-01-221-1/+1
| | | | | Change-Id: Iacefbc031a769f0734e3209ad5d11b60cdab43cc Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtshadertoolsQt Submodule Update Bot2024-01-201-1/+1
| | | | | Change-Id: Ie4e5977f0a7f468d919913744b2b242b7e72e596 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtshadertoolsQt Submodule Update Bot2024-01-191-1/+1
| | | | | Change-Id: Iae1486162a72cbc7d01c26ab9a81a7c72fda4e1b Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtshadertoolsQt Submodule Update Bot2024-01-181-1/+1
| | | | | Change-Id: I01c4732f4a2ee010fded684a1e75f045eba055f7 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* glslang: Fix INTEGRITY issuesKimmo Ollila2024-01-1514-186/+1151
| | | | | | | | | | Fix QtShaderTools namespaces patch for INTEGRITY with updated glslang 13.0.0 Fixes: QTBUG-120513 Pick-to: 6.7 Change-Id: Iae2a24a6ac7c23ea272c4508410de57178f9da9d Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Update dependencies on 'dev' in qt/qtshadertoolsQt Submodule Update Bot2024-01-151-1/+1
| | | | | Change-Id: I6549eea5c4024ff86f59b49ee539d3cfd7de98e2 Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
* Remove the use of GENERATE_PRIVATE_CPP_EXPORTSAlexey Edelev2024-01-121-1/+0
| | | | | | | Task-number: QTBUG-117983 Change-Id: Ie7d9b059b0300f81c47aa631a6b0ac6822a4d130 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Remove the use of Q_SHADERTOOLS_PRIVATE_EXPORTAlexey Edelev2024-01-124-4/+4
| | | | | | Task-number: QTBUG-117983 Change-Id: Ia5a3ef575e1fb662ffb566fc9e8a77593e8ef78a Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-24 06:01:15 +0000