diff options
| author | Gunnar Sletta <gunnar.sletta@jollamobile.com> | 2014-06-09 10:42:08 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-06-12 11:08:53 +0200 |
| commit | f43d6f8e530b236c6cae256022de0d4ef8559f89 (patch) | |
| tree | 811f0b5ee6173bba94d3c5ae08d37b4131ec469e | |
| parent | e897eec27d3e9322e2048db3afae651a79578e85 (diff) | |
Make sure shader rewriter stops immediately on an empty string.
The 'invalid' token didn't really serve a purpose. If a string contains
0 for any reason, it one has reached the end.
Task-number: QTBUG-39505
Change-Id: I3fc9b8f28dc223386a72bbfa28f70fcca0fde223
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
| -rw-r--r-- | src/quick/scenegraph/coreapi/qsgshaderrewriter.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/quick/scenegraph/coreapi/qsgshaderrewriter.cpp b/src/quick/scenegraph/coreapi/qsgshaderrewriter.cpp index 9ff0971774..bffdf40bc1 100644 --- a/src/quick/scenegraph/coreapi/qsgshaderrewriter.cpp +++ b/src/quick/scenegraph/coreapi/qsgshaderrewriter.cpp @@ -52,7 +52,6 @@ namespace QSGShaderRewriter { struct Tokenizer { enum Token { - Token_Invalid, Token_Void, Token_OpenBrace, Token_CloseBrace, @@ -75,7 +74,6 @@ struct Tokenizer { }; const char *Tokenizer::NAMES[] = { - "Invalid", "Void", "OpenBrace", "CloseBrace", @@ -167,7 +165,7 @@ Tokenizer::Token Tokenizer::next() } } - return Token_Invalid; + return Token_EOF; } } |