commit d77841743376350e4e483a955cd94cf77d8bca63
author shannonwoods@chromium.org <shannonwoods@chromium.org@736b8ea6-26fd-11df-bfd4-992fa37f6226> Thu May 30 00:07:03 2013 +0000
committer shannonwoods@chromium.org <shannonwoods@chromium.org@736b8ea6-26fd-11df-bfd4-992fa37f6226> Thu May 30 00:07:03 2013 +0000
tree a6ea0703cc8e24dec206cd26c6a95571e8aff979
parent 38676dc14bd6136e9607e05825890ecf5cb402f1

Add state for uniform blocks to ProgramBinary, along with loading and saving of the new binary format.

Updated Version.h with this patch.

TRAC #22858

Signed-off-by: Geoff Lang
Signed-off-by: Nicolas Capens
Author: Jamie Madill
Conflicts:

	src/common/version.h

git-svn-id: https://angleproject.googlecode.com/svn/branches/es3proto@2306 736b8ea6-26fd-11df-bfd4-992fa37f6226

src/libGLESv2/ProgramBinary.h

diff --git a/src/libGLESv2/ProgramBinary.h b/src/libGLESv2/ProgramBinary.h
index 2589d82..709d43a 100644
--- a/src/libGLESv2/ProgramBinary.h
+++ b/src/libGLESv2/ProgramBinary.h
@@ -184,6 +184,7 @@
     bool mUsesPointSize;
 
     UniformArray mUniforms;
+    UniformBlockArray mUniformBlocks;
     typedef std::vector<UniformLocation> UniformIndex;
     UniformIndex mUniformIndex;