diff --git a/src/libs/glsl/glslkeywords.cpp b/src/libs/glsl/glslkeywords.cpp index 58a41e2879a4dc76781a71c6fa511921e20f94e4..59b202a2a4fe4b69771ab46f16fe0eb4bfc7893b 100644 --- a/src/libs/glsl/glslkeywords.cpp +++ b/src/libs/glsl/glslkeywords.cpp @@ -116,7 +116,7 @@ static inline int classify4(const char *s) { if (s[1] == 'o') { if (s[2] == 'w') { if (s[3] == 'p') { - return Parser::T_LOWP | Lexer::Variant_GLSL_Qt | Lexer::Variant_GLSL_ES_100 | Lexer::Variant_GLSL_400; + return Parser::T_LOWP | Lexer::Variant_GLSL_ES_100 | Lexer::Variant_GLSL_400; } } } @@ -274,7 +274,7 @@ static inline int classify5(const char *s) { if (s[2] == 'g') { if (s[3] == 'h') { if (s[4] == 'p') { - return Parser::T_HIGHP | Lexer::Variant_GLSL_Qt | Lexer::Variant_GLSL_ES_100 | Lexer::Variant_GLSL_400; + return Parser::T_HIGHP | Lexer::Variant_GLSL_ES_100 | Lexer::Variant_GLSL_400; } } } @@ -563,7 +563,7 @@ static inline int classify7(const char *s) { if (s[4] == 'u') { if (s[5] == 'm') { if (s[6] == 'p') { - return Parser::T_MEDIUMP | Lexer::Variant_GLSL_Qt | Lexer::Variant_GLSL_ES_100 | Lexer::Variant_GLSL_400; + return Parser::T_MEDIUMP | Lexer::Variant_GLSL_ES_100 | Lexer::Variant_GLSL_400; } } } diff --git a/src/libs/glsl/glsllexer.h b/src/libs/glsl/glsllexer.h index b8e906be1ac8a27d082c9eb9b086107f4877bea7..d56d8cebb6b74be95a2907dfcb10689771fcfea2 100644 --- a/src/libs/glsl/glsllexer.h +++ b/src/libs/glsl/glsllexer.h @@ -74,7 +74,6 @@ public: Variant_GLSL_150 = 0x00020000, // 1.50 and higher Variant_GLSL_400 = 0x00040000, // 4.00 and higher Variant_GLSL_ES_100 = 0x00080000, // ES 1.00 and higher - Variant_GLSL_Qt = 0x00100000, Variant_VertexShader = 0x00200000, Variant_FragmentShader = 0x00400000, Variant_Reserved = 0x80000000, diff --git a/src/libs/glsl/specs/glsl.keywords b/src/libs/glsl/specs/glsl.keywords index b964fae7cfa9cf698843aedaa16e4d80c986be54..fbbee6cdbfe93051b8081d04a3a205d9a696409e 100644 --- a/src/libs/glsl/specs/glsl.keywords +++ b/src/libs/glsl/specs/glsl.keywords @@ -45,7 +45,7 @@ else flat %variant GLSL_150 float for -highp %variant GLSL_Qt | GLSL_ES_100 | GLSL_400 +highp %variant GLSL_ES_100 | GLSL_400 if in inout @@ -66,7 +66,7 @@ ivec2 ivec3 ivec4 layout %variant GLSL_150 -lowp %variant GLSL_Qt | GLSL_ES_100 | GLSL_400 +lowp %variant GLSL_ES_100 | GLSL_400 mat2 mat2x2 %variant GLSL_120 mat2x3 %variant GLSL_120 @@ -79,7 +79,7 @@ mat4 mat4x2 %variant GLSL_120 mat4x3 %variant GLSL_120 mat4x4 %variant GLSL_120 -mediump %variant GLSL_Qt | GLSL_ES_100 | GLSL_400 +mediump %variant GLSL_ES_100 | GLSL_400 noperspective %variant GLSL_150 out patch %variant GLSL_400 diff --git a/src/libs/glsl/tests/main.cpp b/src/libs/glsl/tests/main.cpp index 8c4e74dab383e237aae9858df0ec3346f42d2a80..11b929f5d179ad1f6eeee16b6eead5c72e540a1b 100644 --- a/src/libs/glsl/tests/main.cpp +++ b/src/libs/glsl/tests/main.cpp @@ -41,9 +41,6 @@ int main(int argc, char *argv[]) variant |= Lexer::Variant_GLSL_400; } else if (!strcmp(argv[1], "--version=es")) { variant |= Lexer::Variant_GLSL_ES_100; - } else if (!strcmp(argv[1], "--version=qt")) { - variant |= Lexer::Variant_GLSL_ES_100 | - Lexer::Variant_GLSL_Qt; } else if (!strcmp(argv[1], "--shader=vertex")) { variant |= Lexer::Variant_VertexShader; } else if (!strcmp(argv[1], "--shader=fragment")) { diff --git a/src/plugins/glsleditor/glsleditor.cpp b/src/plugins/glsleditor/glsleditor.cpp index cb21ccb6b8486aa70c2422936dcc3beb634b5ce5..5ff01d764d5ae7292ff47b431c8b32869c1d423e 100644 --- a/src/plugins/glsleditor/glsleditor.cpp +++ b/src/plugins/glsleditor/glsleditor.cpp @@ -405,7 +405,7 @@ int GLSLTextEditor::languageVariant() const if (isDesktop) variant |= Lexer::Variant_GLSL_120; else - variant |= Lexer::Variant_GLSL_Qt; + variant |= Lexer::Variant_GLSL_ES_100; if (isVertex) variant |= Lexer::Variant_VertexShader; if (isFragment)