gpu: Add ANGLE commit to program cache hash.

gpu/command_buffer/service/program_cache.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "gpu/command_buffer/service/program_cache.h"
 
 #include <string>
 #include "base/memory/scoped_ptr.h"
 #include "gpu/command_buffer/service/shader_manager.h"
+#include "third_party/angle/src/common/version.h"
 
 namespace gpu {
 namespace gles2 {
 
 ProgramCache::ProgramCache() {}
 ProgramCache::~ProgramCache() {}
 
 void ProgramCache::Clear() {
   ClearBackend();
   link_status_.clear();
@@ skipping 87 matching lines @@
 
 void ProgramCache::ComputeProgramHash(
     const char* hashed_shader_0,
     const char* hashed_shader_1,
     const std::map<std::string, GLint>* bind_attrib_location_map,
     const std::vector<std::string>& transform_feedback_varyings,
     GLenum transform_feedback_buffer_mode,
     char* result) const {
   const size_t shader0_size = kHashLength;
   const size_t shader1_size = kHashLength;
+  const size_t angle_commit_size = ANGLE_COMMIT_HASH_SIZE;
   const size_t map_size = CalculateMapSize(bind_attrib_location_map);
   const size_t var_size = CalculateVaryingsSize(transform_feedback_varyings);
-  const size_t total_size = shader0_size + shader1_size + map_size + var_size
-      + sizeof(transform_feedback_buffer_mode);
+  const size_t total_size = shader0_size + shader1_size + angle_commit_size
+      + map_size + var_size + sizeof(transform_feedback_buffer_mode);
 
   scoped_ptr<unsigned char[]> buffer(new unsigned char[total_size]);
   memcpy(buffer.get(), hashed_shader_0, shader0_size);
   memcpy(&buffer[shader0_size], hashed_shader_1, shader1_size);
   size_t current_pos = shader0_size + shader1_size;
+  memcpy(&buffer[current_pos], ANGLE_COMMIT_HASH, angle_commit_size);
+  current_pos += angle_commit_size;
   if (map_size != 0) {
     // copy our map
     for (auto it = bind_attrib_location_map->begin();
          it != bind_attrib_location_map->end();
          ++it) {
       const size_t name_size = it->first.length();
       memcpy(&buffer.get()[current_pos], it->first.c_str(), name_size);
       current_pos += name_size;
       const GLint value = it->second;
       buffer[current_pos++] = value >> 24;
@@ skipping 13 matching lines @@
     }
   }
   memcpy(&buffer[current_pos], &transform_feedback_buffer_mode,
       sizeof(transform_feedback_buffer_mode));
   base::SHA1HashBytes(buffer.get(),
                       total_size, reinterpret_cast<unsigned char*>(result));
 }
 
 }  // namespace gles2
 }  // namespace gpu