aboutsummaryrefslogtreecommitdiff
path: root/glslang/MachineIndependent/Scan.cpp
diff options
context:
space:
mode:
authorJohn Kessenich <cepheus@frii.com>2013-09-06 19:52:57 +0000
committerJohn Kessenich <cepheus@frii.com>2013-09-06 19:52:57 +0000
commit38f3b890de0e81fad79d2db63b496f13641842a7 (patch)
tree90f6e7a8f56e829925fb5d615bce34f9c46344f1 /glslang/MachineIndependent/Scan.cpp
parent69f4b517c2162941466a6ff709fcf9db52881cce (diff)
downloadglslang-38f3b890de0e81fad79d2db63b496f13641842a7.tar.gz
Ensure the shared symbol table levels are read-only to make multi-threading safe. Also removed inadvertent extra copies of the symbol table shared across all stages.
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@22939 e7fa87d3-cd2b-0410-9028-fcbf551c1848
Diffstat (limited to 'glslang/MachineIndependent/Scan.cpp')
-rw-r--r--glslang/MachineIndependent/Scan.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/glslang/MachineIndependent/Scan.cpp b/glslang/MachineIndependent/Scan.cpp
index b37c50cb..e6232fbe 100644
--- a/glslang/MachineIndependent/Scan.cpp
+++ b/glslang/MachineIndependent/Scan.cpp
@@ -851,7 +851,7 @@ int TScanContext::tokenizeIdentifier()
return identifierOrReserved(reserved);
}
- default:
+ default:
parseContext.infoSink.info.message(EPrefixInternalError, "Unknown glslang keyword", loc);
return 0;
}
@@ -868,7 +868,7 @@ int TScanContext::identifierOrType()
parserToken->sType.lex.symbol = parseContext.symbolTable.find(*parserToken->sType.lex.string);
if (afterType == false && parserToken->sType.lex.symbol) {
- if (TVariable* variable = parserToken->sType.lex.symbol->getAsVariable()) {
+ if (const TVariable* variable = parserToken->sType.lex.symbol->getAsVariable()) {
if (variable->isUserType()) {
afterType = true;