diff options
| author | Laszlo Agocs <laszlo.agocs@digia.com> | 2014-06-02 12:07:13 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-06-03 10:34:39 +0200 |
| commit | d6f71a6b47ad53bbce13db367ccb996ae2d392c8 (patch) | |
| tree | 5d26da77db5353100d510b4d67d2b837a95ad4cc | |
| parent | a9019adc013b711df6a9e2831b08306ea5591f31 (diff) | |
Recognize "in" keyword in vertex shaders
Checking only for "attribute" is not sufficient: with newer GLSL versions
"in" is used.
Task-number: QTBUG-39143
Change-Id: Ibdb5940f5aba1485ecaad2e2c4a3aa7150af6d99
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
| -rw-r--r-- | src/quick/items/qquickshadereffect.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/quick/items/qquickshadereffect.cpp b/src/quick/items/qquickshadereffect.cpp index e57b7abddc..8bcd2e64db 100644 --- a/src/quick/items/qquickshadereffect.cpp +++ b/src/quick/items/qquickshadereffect.cpp @@ -97,7 +97,8 @@ namespace { // Returns -1 if not found, returns index to first character after the name if found. int qt_search_for_variable(const char *s, int length, int index, VariableQualifier &decl, int &typeIndex, int &typeLength, - int &nameIndex, int &nameLength) + int &nameIndex, int &nameLength, + QQuickShaderEffectCommon::Key::ShaderType shaderType) { enum Identifier { QualifierIdentifier, // Base state @@ -124,6 +125,7 @@ namespace { int idLength = index - idIndex; const int attrLen = sizeof("attribute") - 1; + const int inLen = sizeof("in") - 1; const int uniLen = sizeof("uniform") - 1; const int loLen = sizeof("lowp") - 1; const int medLen = sizeof("mediump") - 1; @@ -134,6 +136,10 @@ namespace { if (idLength == attrLen && qstrncmp("attribute", s + idIndex, attrLen) == 0) { decl = AttributeQualifier; expected = PrecisionIdentifier; + } else if (shaderType == QQuickShaderEffectCommon::Key::VertexShader + && idLength == inLen && qstrncmp("in", s + idIndex, inLen) == 0) { + decl = AttributeQualifier; + expected = PrecisionIdentifier; } else if (idLength == uniLen && qstrncmp("uniform", s + idIndex, uniLen) == 0) { decl = UniformQualifier; expected = PrecisionIdentifier; @@ -287,7 +293,7 @@ void QQuickShaderEffectCommon::lookThroughShaderCode(QQuickItem *item, Key::Shad const char *s = code.constData(); VariableQualifier decl = AttributeQualifier; while ((index = qt_search_for_variable(s, code.size(), index, decl, typeIndex, typeLength, - nameIndex, nameLength)) != -1) + nameIndex, nameLength, shaderType)) != -1) { if (decl == AttributeQualifier) { if (shaderType == Key::VertexShader) |