aboutsummaryrefslogtreecommitdiff
path: root/glslang/MachineIndependent/ParseHelper.cpp
diff options
context:
space:
mode:
authorJohn Kessenich <cepheus@frii.com>2013-11-12 22:02:36 +0000
committerJohn Kessenich <cepheus@frii.com>2013-11-12 22:02:36 +0000
commitffa66d3bc7a9e966b7088ba83061b5959f9527c1 (patch)
treef995e2d148e59b036d9d1d3a5cecf3b074bda227 /glslang/MachineIndependent/ParseHelper.cpp
parent029d746bad818aa8d212188c09983b15ab8c0822 (diff)
downloadglslang-ffa66d3bc7a9e966b7088ba83061b5959f9527c1.tar.gz
Disallow arrays in initializers for non-array-object versions (assignment, etc. were already caught, but not initialization).
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@24022 e7fa87d3-cd2b-0410-9028-fcbf551c1848
Diffstat (limited to 'glslang/MachineIndependent/ParseHelper.cpp')
-rw-r--r--glslang/MachineIndependent/ParseHelper.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/glslang/MachineIndependent/ParseHelper.cpp b/glslang/MachineIndependent/ParseHelper.cpp
index f23b37e9..765c8858 100644
--- a/glslang/MachineIndependent/ParseHelper.cpp
+++ b/glslang/MachineIndependent/ParseHelper.cpp
@@ -2927,6 +2927,7 @@ TIntermNode* TParseContext::executeInitializer(TSourceLoc loc, TString& identifi
error(loc, " cannot initialize this type of qualifier ", variable->getType().getStorageQualifierString(), "");
return 0;
}
+ arrayObjectCheck(loc, variable->getType(), "array initializer");
//
// If the initializer was from braces { ... }, we convert the whole subtree to a