aboutsummaryrefslogtreecommitdiff
path: root/glslang/MachineIndependent/Intermediate.cpp
diff options
context:
space:
mode:
authorJohn Kessenich <cepheus@frii.com>2013-09-08 21:04:46 +0000
committerJohn Kessenich <cepheus@frii.com>2013-09-08 21:04:46 +0000
commit5f753e022204cf020f427f967bd6fcde8b6b6111 (patch)
tree59c8c95d163b09d993382e5e3015c32ee1edc529 /glslang/MachineIndependent/Intermediate.cpp
parent38f3b890de0e81fad79d2db63b496f13641842a7 (diff)
downloadglslang-5f753e022204cf020f427f967bd6fcde8b6b6111.tar.gz
Full thread safety working:
- don't use [] for map lookups, it can modify the map - copy up built-in symbols out of shared symbol table levels before modifying them - enforce shallow vs. deep TType copies - combine maxArraySize with the array dimensions vector, encapsulate - remove chaining of array types git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@22953 e7fa87d3-cd2b-0410-9028-fcbf551c1848
Diffstat (limited to 'glslang/MachineIndependent/Intermediate.cpp')
-rw-r--r--glslang/MachineIndependent/Intermediate.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/glslang/MachineIndependent/Intermediate.cpp b/glslang/MachineIndependent/Intermediate.cpp
index 9baa2934..a4847422 100644
--- a/glslang/MachineIndependent/Intermediate.cpp
+++ b/glslang/MachineIndependent/Intermediate.cpp
@@ -716,8 +716,8 @@ TIntermTyped* TIntermediate::addComma(TIntermTyped* left, TIntermTyped* right, T
TIntermTyped *commaAggregate = growAggregate(left, right, loc);
commaAggregate->getAsAggregate()->setOperator(EOpComma);
commaAggregate->setType(right->getType());
- commaAggregate->getTypePointer()->getQualifier().storage = EvqTemporary;
- commaAggregate->getTypePointer()->getQualifier().precision = right->getTypePointer()->getQualifier().precision;
+ commaAggregate->getWritableType().getQualifier().storage = EvqTemporary;
+ commaAggregate->getWritableType().getQualifier().precision = right->getType().getQualifier().precision;
return commaAggregate;
}
@@ -1028,7 +1028,7 @@ bool TIntermUnary::promote()
}
setType(operand->getType());
- getTypePointer()->getQualifier().storage = EvqTemporary;
+ getWritableType().getQualifier().storage = EvqTemporary;
return true;
}