aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Kessenich <cepheus@frii.com>2016-11-27 17:26:21 -0700
committerJohn Kessenich <cepheus@frii.com>2016-11-27 17:26:21 -0700
commit509c4216e6af3d5fdf020c4a373473831923a42b (patch)
tree2f5382c1fea04ee10d866e7ca5f1ae695f9b0e0b
parente50dc536ff76310bd24fa222397cca9d0b6acacf (diff)
downloadglslang-509c4216e6af3d5fdf020c4a373473831923a42b.tar.gz
Non-functional: Fix typos.
-rw-r--r--Test/baseResults/310AofA.vert.out2
-rw-r--r--Test/baseResults/430AofA.frag.out2
-rw-r--r--glslang/Include/ConstantUnion.h2
-rw-r--r--glslang/Include/revision.h4
-rw-r--r--glslang/MachineIndependent/ParseHelper.cpp2
-rwxr-xr-xhlsl/hlslParseHelper.cpp2
6 files changed, 7 insertions, 7 deletions
diff --git a/Test/baseResults/310AofA.vert.out b/Test/baseResults/310AofA.vert.out
index 83f105ca..28592d51 100644
--- a/Test/baseResults/310AofA.vert.out
+++ b/Test/baseResults/310AofA.vert.out
@@ -5,7 +5,7 @@ ERROR: 0:23: '' : array size required
ERROR: 0:28: '[]' : only outermost dimension of an array of arrays can be implicitly sized
ERROR: 0:40: '' : array size required
ERROR: 0:48: 'constructor' : constructing non-array constituent from array argument
-ERROR: 0:49: 'constructior' : array constructor argument not correct type to construct array element
+ERROR: 0:49: 'constructor' : array constructor argument not correct type to construct array element
ERROR: 0:62: '[' : array index out of range '4'
ERROR: 0:78: 'assign' : cannot convert from 'global 4-element array of 7-element array of highp float' to 'global 5-element array of 7-element array of highp float'
ERROR: 0:79: 'assign' : cannot convert from 'global 4-element array of 7-element array of highp float' to 'global implicitly-sized array of 7-element array of highp float'
diff --git a/Test/baseResults/430AofA.frag.out b/Test/baseResults/430AofA.frag.out
index 68285f73..f3bbfb8b 100644
--- a/Test/baseResults/430AofA.frag.out
+++ b/Test/baseResults/430AofA.frag.out
@@ -2,7 +2,7 @@
Warning, version 430 is not yet complete; most version-specific features are present, but some are missing.
ERROR: 0:6: '[]' : only outermost dimension of an array of arrays can be implicitly sized
ERROR: 0:14: 'constructor' : constructing non-array constituent from array argument
-ERROR: 0:15: 'constructior' : array constructor argument not correct type to construct array element
+ERROR: 0:15: 'constructor' : array constructor argument not correct type to construct array element
ERROR: 0:28: '[' : array index out of range '4'
ERROR: 0:56: 'constructor' : cannot convert parameter 2 from 'const 3-element array of 4-component vector of float' to 'temp 2-element array of 4-component vector of float'
ERROR: 0:60: 'constructor' : cannot convert parameter 2 from 'const 2-element array of 4-component vector of float' to 'temp 3-element array of 4-component vector of float'
diff --git a/glslang/Include/ConstantUnion.h b/glslang/Include/ConstantUnion.h
index 8ee2c84c..ec6aff11 100644
--- a/glslang/Include/ConstantUnion.h
+++ b/glslang/Include/ConstantUnion.h
@@ -538,7 +538,7 @@ private:
};
// Encapsulate having a pointer to an array of TConstUnion,
-// which only needs to be allocated if it's size is going to be
+// which only needs to be allocated if its size is going to be
// bigger than 0.
//
// One convenience is being able to use [] to go inside the array, instead
diff --git a/glslang/Include/revision.h b/glslang/Include/revision.h
index 57a322e4..2cfdada1 100644
--- a/glslang/Include/revision.h
+++ b/glslang/Include/revision.h
@@ -2,5 +2,5 @@
// For the version, it uses the latest git tag followed by the number of commits.
// For the date, it uses the current date (when then script is run).
-#define GLSLANG_REVISION "Overload400-PrecQual.1661"
-#define GLSLANG_DATE "26-Nov-2016"
+#define GLSLANG_REVISION "Overload400-PrecQual.1662"
+#define GLSLANG_DATE "27-Nov-2016"
diff --git a/glslang/MachineIndependent/ParseHelper.cpp b/glslang/MachineIndependent/ParseHelper.cpp
index 016f07a2..831e3ac0 100644
--- a/glslang/MachineIndependent/ParseHelper.cpp
+++ b/glslang/MachineIndependent/ParseHelper.cpp
@@ -2313,7 +2313,7 @@ bool TParseContext::constructorError(const TSourceLoc& loc, TIntermNode* node, T
// At least the dimensionalities have to match.
if (! function[0].type->isArray() || arraySizes.getNumDims() != function[0].type->getArraySizes().getNumDims() + 1) {
- error(loc, "array constructor argument not correct type to construct array element", "constructior", "");
+ error(loc, "array constructor argument not correct type to construct array element", "constructor", "");
return true;
}
diff --git a/hlsl/hlslParseHelper.cpp b/hlsl/hlslParseHelper.cpp
index b40546ef..3f73a6fb 100755
--- a/hlsl/hlslParseHelper.cpp
+++ b/hlsl/hlslParseHelper.cpp
@@ -3381,7 +3381,7 @@ bool HlslParseContext::constructorError(const TSourceLoc& loc, TIntermNode* /*no
// At least the dimensionalities have to match.
if (! function[0].type->isArray() || arraySizes.getNumDims() != function[0].type->getArraySizes().getNumDims() + 1) {
- error(loc, "array constructor argument not correct type to construct array element", "constructior", "");
+ error(loc, "array constructor argument not correct type to construct array element", "constructor", "");
return true;
}