commit 68bb55c09be1e53d01dad6ada5a26db46bff9c64
author kbr@chromium.org <kbr@chromium.org@736b8ea6-26fd-11df-bfd4-992fa37f6226> Thu Jan 05 20:06:28 2012 +0000
committer kbr@chromium.org <kbr@chromium.org@736b8ea6-26fd-11df-bfd4-992fa37f6226> Thu Jan 05 20:06:28 2012 +0000
tree ceee15ce02fcca819706d0660ab0fed785693bd9
parent 613848e1180befd0a33b9361116cf35331f2a45c

Fix off-by-one error in enforcement of WebGL's maximum struct nesting.

BUG=http://code.google.com/p/angleproject/issues/detail?id=275
TEST=WebGL conformance suite
TBR=nicolas
Review URL: http://codereview.appspot.com/5520049

git-svn-id: http://angleproject.googlecode.com/svn/trunk@938 736b8ea6-26fd-11df-bfd4-992fa37f6226

src/common/version.h

diff --git a/src/common/version.h b/src/common/version.h
index 451afac..2f565fd 100644
--- a/src/common/version.h
+++ b/src/common/version.h
@@ -1,7 +1,7 @@
 #define MAJOR_VERSION 1
 #define MINOR_VERSION 0
 #define BUILD_VERSION 0
-#define BUILD_REVISION 930
+#define BUILD_REVISION 938
 
 #define STRINGIFY(x) #x
 #define MACRO_STRINGIFY(x) STRINGIFY(x)

src/compiler/ParseHelper.cpp

diff --git a/src/compiler/ParseHelper.cpp b/src/compiler/ParseHelper.cpp
index 529fbef..431f8d1 100644
--- a/src/compiler/ParseHelper.cpp
+++ b/src/compiler/ParseHelper.cpp
@@ -1463,7 +1463,7 @@
 
     // We're already inside a structure definition at this point, so add
     // one to the field's struct nesting.
-    if (1 + fieldType.getDeepestStructNesting() >= kWebGLMaxStructNesting) {
+    if (1 + fieldType.getDeepestStructNesting() > kWebGLMaxStructNesting) {
         error(line, "", "", "Reference of struct type %s exceeds maximum struct nesting of %d",
               fieldType.getTypeName().c_str(), kWebGLMaxStructNesting);
         return true;