diff options
| -rw-r--r-- | src/gui/util/qshadergenerator.cpp | 4 | ||||
| -rw-r--r-- | src/gui/util/qshaderlanguage_p.h | 1 | ||||
| -rw-r--r-- | tests/auto/gui/util/qshadergenerator/tst_qshadergenerator.cpp | 4 |
3 files changed, 9 insertions, 0 deletions
diff --git a/src/gui/util/qshadergenerator.cpp b/src/gui/util/qshadergenerator.cpp index 31c2f74746..ae45c03fd1 100644 --- a/src/gui/util/qshadergenerator.cpp +++ b/src/gui/util/qshadergenerator.cpp @@ -61,6 +61,8 @@ namespace return ""; // Although fragment shaders for <=2 only have fixed outputs case QShaderLanguage::Uniform: return "uniform"; + case QShaderLanguage::BuiltIn: + return "//"; } } else { switch (qualifier) { @@ -72,6 +74,8 @@ namespace return "out"; case QShaderLanguage::Uniform: return "uniform"; + case QShaderLanguage::BuiltIn: + return "//"; } } diff --git a/src/gui/util/qshaderlanguage_p.h b/src/gui/util/qshaderlanguage_p.h index 5c7819a3b8..e392a6c7bb 100644 --- a/src/gui/util/qshaderlanguage_p.h +++ b/src/gui/util/qshaderlanguage_p.h @@ -64,6 +64,7 @@ namespace QShaderLanguage enum StorageQualifier : char { Const = 1, Input, + BuiltIn, Output, Uniform }; diff --git a/tests/auto/gui/util/qshadergenerator/tst_qshadergenerator.cpp b/tests/auto/gui/util/qshadergenerator/tst_qshadergenerator.cpp index d0a0225055..82197f815e 100644 --- a/tests/auto/gui/util/qshadergenerator/tst_qshadergenerator.cpp +++ b/tests/auto/gui/util/qshadergenerator/tst_qshadergenerator.cpp @@ -372,6 +372,8 @@ namespace { return "const"; case QShaderLanguage::Input: return "varying"; + case QShaderLanguage::BuiltIn: + return "//"; case QShaderLanguage::Output: return ""; // Although fragment shaders for <=2 only have fixed outputs case QShaderLanguage::Uniform: @@ -383,6 +385,8 @@ namespace { return "const"; case QShaderLanguage::Input: return "in"; + case QShaderLanguage::BuiltIn: + return "//"; case QShaderLanguage::Output: return "out"; case QShaderLanguage::Uniform: |