commit 0aa84f6338a42ec8f3ea23c3da27c3c86e21d846
author Jamie Madill <jmadill@chromium.org> Thu Feb 13 13:17:23 2014 -0500
committer Jamie Madill <jmadill@chromium.org> Fri Feb 14 15:02:13 2014 +0000
tree 008324a3bc332677cb434146b5eb5a3c711d980f
parent 5f6937ca23764555fcdad48d67d2572af7b6a0d7

Merge 'Tie program binary version to commit hash.'

Port changes from master branch with commit hash embedding
to the development branch.

BUG=angle:529
Change-Id: I307bf44103913aaaeb875a2e3ade1fab77838c48
Reviewed-on: https://chromium-review.googlesource.com/186390
Reviewed-by: Shannon Woods <shannonwoods@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tested-by: Jamie Madill <jmadill@chromium.org>

src/libGLESv2/ProgramBinary.cpp

diff --git a/src/libGLESv2/ProgramBinary.cpp b/src/libGLESv2/ProgramBinary.cpp
index e23efe3..e98487e 100644
--- a/src/libGLESv2/ProgramBinary.cpp
+++ b/src/libGLESv2/ProgramBinary.cpp
@@ -1649,15 +1649,15 @@
     int minorVersion = 0;
     stream.read(&majorVersion);
     stream.read(&minorVersion);
-    if (majorVersion != MAJOR_VERSION || minorVersion != MINOR_VERSION)
+    if (majorVersion != ANGLE_MAJOR_VERSION || minorVersion != ANGLE_MINOR_VERSION)
     {
         infoLog.append("Invalid program binary version.");
         return false;
     }
 
-    unsigned char commitString[COMMIT_STRING_LEN];
-    stream.read(commitString, COMMIT_STRING_LEN);
-    if (memcmp(commitString, COMMIT_STRING, sizeof(unsigned char) * COMMIT_STRING_LEN) != 0)
+    unsigned char commitString[ANGLE_COMMIT_HASH_SIZE];
+    stream.read(commitString, ANGLE_COMMIT_HASH_SIZE);
+    if (memcmp(commitString, ANGLE_COMMIT_HASH, sizeof(unsigned char) * ANGLE_COMMIT_HASH_SIZE) != 0)
     {
         infoLog.append("Invalid program binary version.");
         return false;
@@ -1875,9 +1875,9 @@
     BinaryOutputStream stream;
 
     stream.write(GL_PROGRAM_BINARY_ANGLE);
-    stream.write(MAJOR_VERSION);
-    stream.write(MINOR_VERSION);
-    stream.write(COMMIT_STRING, COMMIT_STRING_LEN);
+    stream.write(ANGLE_MAJOR_VERSION);
+    stream.write(ANGLE_MINOR_VERSION);
+    stream.write(ANGLE_COMMIT_HASH, ANGLE_COMMIT_HASH_SIZE);
     stream.write(ANGLE_COMPILE_OPTIMIZATION_LEVEL);
 
     for (unsigned int i = 0; i < MAX_VERTEX_ATTRIBS; ++i)