Save interface block infomation to program cache.

gpu/command_buffer/service/memory_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/memory_program_cache.h"
 
 #include <stddef.h>
 
 #include "base/base64.h"
 #include "base/callback.h"
@@ skipping 46 matching lines @@
   proto->set_interpolation(varying.interpolation);
   proto->set_is_invariant(varying.isInvariant);
 }
 
 void FillShaderOutputVariableProto(ShaderOutputVariableProto* proto,
                                    const sh::OutputVariable& attrib) {
   FillShaderVariableProto(proto->mutable_basic(), attrib);
   proto->set_location(attrib.location);
 }
 
+void FillShaderInterfaceBlockFieldProto(
+    ShaderInterfaceBlockFieldProto* proto,
+    const sh::InterfaceBlockField& interfaceBlockField) {
+  FillShaderVariableProto(proto->mutable_basic(), interfaceBlockField);
+  proto->set_is_row_major_layout(interfaceBlockField.isRowMajorLayout);
+}
+
+void FillShaderInterfaceBlockProto(ShaderInterfaceBlockProto* proto,
+    const sh::InterfaceBlock& interfaceBlock) {
+  proto->set_name(interfaceBlock.name);
+  proto->set_mapped_name(interfaceBlock.mappedName);
+  proto->set_instance_name(interfaceBlock.instanceName);
+  proto->set_array_size(interfaceBlock.arraySize);
+  proto->set_layout(interfaceBlock.layout);
+  proto->set_is_row_major_layout(interfaceBlock.isRowMajorLayout);
+  proto->set_static_use(interfaceBlock.staticUse);
+  for (size_t ii = 0; ii < interfaceBlock.fields.size(); ++ii) {
+    ShaderInterfaceBlockFieldProto* field = proto->add_fields();
+    FillShaderInterfaceBlockFieldProto(field, interfaceBlock.fields[ii]);
+  }
+}
+
 void FillShaderProto(ShaderProto* proto, const char* sha,
                      const Shader* shader) {
   proto->set_sha(sha, gpu::gles2::ProgramCache::kHashLength);
   for (AttributeMap::const_iterator iter = shader->attrib_map().begin();
        iter != shader->attrib_map().end(); ++iter) {
     ShaderAttributeProto* info = proto->add_attribs();
     FillShaderAttributeProto(info, iter->second);
   }
   for (UniformMap::const_iterator iter = shader->uniform_map().begin();
        iter != shader->uniform_map().end(); ++iter) {
     ShaderUniformProto* info = proto->add_uniforms();
     FillShaderUniformProto(info, iter->second);
   }
   for (VaryingMap::const_iterator iter = shader->varying_map().begin();
        iter != shader->varying_map().end(); ++iter) {
     ShaderVaryingProto* info = proto->add_varyings();
     FillShaderVaryingProto(info, iter->second);
   }
   for (auto iter = shader->output_variable_list().begin();
        iter != shader->output_variable_list().end(); ++iter) {
     ShaderOutputVariableProto* info = proto->add_output_variables();
     FillShaderOutputVariableProto(info, *iter);
   }
+  for (InterfaceBlockMap::const_iterator iter =
+       shader->interface_block_map().begin();
+       iter != shader->interface_block_map().end(); ++iter) {
+    ShaderInterfaceBlockProto* info = proto->add_interface_blocks();
+    FillShaderInterfaceBlockProto(info, iter->second);
+  }
 }
 
 void RetrieveShaderVariableInfo(
     const ShaderVariableProto& proto, sh::ShaderVariable* variable) {
   variable->type = proto.type();
   variable->precision = proto.precision();
   variable->name = proto.name();
   variable->mappedName = proto.mapped_name();
   variable->arraySize = proto.array_size();
   variable->staticUse = proto.static_use();
@@ skipping 29 matching lines @@
 }
 
 void RetrieveShaderOutputVariableInfo(const ShaderOutputVariableProto& proto,
                                       OutputVariableList* list) {
   sh::OutputVariable output_variable;
   RetrieveShaderVariableInfo(proto.basic(), &output_variable);
   output_variable.location = proto.location();
   list->push_back(output_variable);
 }
 
+void RetrieveShaderInterfaceBlockFieldInfo(
+    const ShaderInterfaceBlockFieldProto& proto,
+    sh::InterfaceBlockField* interface_block_field) {
+  RetrieveShaderVariableInfo(proto.basic(), interface_block_field);
+  interface_block_field->isRowMajorLayout = proto.is_row_major_layout();
+}
+
+void RetrieveShaderInterfaceBlockInfo(const ShaderInterfaceBlockProto& proto,
+                                      InterfaceBlockMap* map) {
+  sh::InterfaceBlock interface_block;
+  interface_block.name = proto.name();
+  interface_block.mappedName = proto.mapped_name();
+  interface_block.instanceName = proto.instance_name();
+  interface_block.arraySize = proto.array_size();
+  interface_block.layout = (sh::BlockLayoutType) proto.layout();

[Zhenyao Mo, 2016/05/31 16:31:00]

This is against chromium coding style.  Please use c++ cast instead.

[xinghua.cao, 2016/06/01 03:10:58]

Done.

+  interface_block.isRowMajorLayout = proto.is_row_major_layout();
+  interface_block.staticUse = proto.static_use();
+  interface_block.fields.resize(proto.fields_size());
+  for (int ii = 0; ii < proto.fields_size(); ++ii) {
+    RetrieveShaderInterfaceBlockFieldInfo(proto.fields(ii),
+      &(interface_block.fields[ii]));

[Zhenyao Mo, 2016/05/31 16:31:00]

nit: wrong indent.

[xinghua.cao, 2016/06/01 03:10:58]

Done.

+  }
+  (*map)[proto.mapped_name()] = interface_block;
+}
+
 void RunShaderCallback(const ShaderCacheCallback& callback,
                        GpuProgramProto* proto,
                        std::string sha_string) {
   std::string shader;
   proto->SerializeToString(&shader);
 
   std::string key;
   base::Base64Encode(sha_string, &key);
   callback.Run(key, shader);
 }
@@ skipping 52 matching lines @@
                   value->length());
   GLint success = 0;
   glGetProgramiv(program, GL_LINK_STATUS, &success);
   if (success == GL_FALSE) {
     return PROGRAM_LOAD_FAILURE;
   }
   shader_a->set_attrib_map(value->attrib_map_0());
   shader_a->set_uniform_map(value->uniform_map_0());
   shader_a->set_varying_map(value->varying_map_0());
   shader_a->set_output_variable_list(value->output_variable_list_0());
+  shader_a->set_interface_block_map(value->interface_block_map_0());
   shader_b->set_attrib_map(value->attrib_map_1());
   shader_b->set_uniform_map(value->uniform_map_1());
   shader_b->set_varying_map(value->varying_map_1());
   shader_b->set_output_variable_list(value->output_variable_list_1());
+  shader_b->set_interface_block_map(value->interface_block_map_1());
 
   if (!shader_callback.is_null() && !disable_gpu_shader_disk_cache_) {
     std::unique_ptr<GpuProgramProto> proto(
         GpuProgramProto::default_instance().New());
     proto->set_sha(sha, kHashLength);
     proto->set_format(value->format());
     proto->set_program(value->data(), value->length());
 
     FillShaderProto(proto->mutable_vertex_shader(), a_sha, shader_a);
     FillShaderProto(proto->mutable_fragment_shader(), b_sha, shader_b);
@@ skipping 67 matching lines @@
     FillShaderProto(proto->mutable_vertex_shader(), a_sha, shader_a);
     FillShaderProto(proto->mutable_fragment_shader(), b_sha, shader_b);
     RunShaderCallback(shader_callback, proto.get(), sha_string);
   }
 
   store_.Put(
       sha_string,
       new ProgramCacheValue(
           length, format, binary.release(), sha_string, a_sha,
           shader_a->attrib_map(), shader_a->uniform_map(),
-          shader_a->varying_map(), shader_a->output_variable_list(), b_sha,
+          shader_a->varying_map(), shader_a->output_variable_list(),
+          shader_a->interface_block_map(), b_sha,
           shader_b->attrib_map(), shader_b->uniform_map(),
-          shader_b->varying_map(), shader_b->output_variable_list(), this));
+          shader_b->varying_map(), shader_b->output_variable_list(),
+          shader_b->interface_block_map(), this));
 
   UMA_HISTOGRAM_COUNTS("GPU.ProgramCache.MemorySizeAfterKb",
                        curr_size_bytes_ / 1024);
 }
 
 void MemoryProgramCache::LoadProgram(const std::string& program) {
   std::unique_ptr<GpuProgramProto> proto(
       GpuProgramProto::default_instance().New());
   if (proto->ParseFromString(program)) {
     AttributeMap vertex_attribs;
     UniformMap vertex_uniforms;
     VaryingMap vertex_varyings;
     OutputVariableList vertex_output_variables;
+    InterfaceBlockMap vertex_interface_blocks;
     for (int i = 0; i < proto->vertex_shader().attribs_size(); i++) {
       RetrieveShaderAttributeInfo(proto->vertex_shader().attribs(i),
                                   &vertex_attribs);
     }
     for (int i = 0; i < proto->vertex_shader().uniforms_size(); i++) {
       RetrieveShaderUniformInfo(proto->vertex_shader().uniforms(i),
                                 &vertex_uniforms);
     }
     for (int i = 0; i < proto->vertex_shader().varyings_size(); i++) {
       RetrieveShaderVaryingInfo(proto->vertex_shader().varyings(i),
                                 &vertex_varyings);
     }
     for (int i = 0; i < proto->vertex_shader().output_variables_size(); i++) {
       RetrieveShaderOutputVariableInfo(
           proto->vertex_shader().output_variables(i), &vertex_output_variables);
     }
+    for (int i = 0; i < proto->vertex_shader().interface_blocks_size(); i++) {
+      RetrieveShaderInterfaceBlockInfo(
+          proto->vertex_shader().interface_blocks(i), &vertex_interface_blocks);
+    }
 
     AttributeMap fragment_attribs;
     UniformMap fragment_uniforms;
     VaryingMap fragment_varyings;
     OutputVariableList fragment_output_variables;
+    InterfaceBlockMap fragment_interface_blocks;
     for (int i = 0; i < proto->fragment_shader().attribs_size(); i++) {
       RetrieveShaderAttributeInfo(proto->fragment_shader().attribs(i),
                                   &fragment_attribs);
     }
     for (int i = 0; i < proto->fragment_shader().uniforms_size(); i++) {
       RetrieveShaderUniformInfo(proto->fragment_shader().uniforms(i),
                                 &fragment_uniforms);
     }
     for (int i = 0; i < proto->fragment_shader().varyings_size(); i++) {
       RetrieveShaderVaryingInfo(proto->fragment_shader().varyings(i),
                                 &fragment_varyings);
     }
     for (int i = 0; i < proto->fragment_shader().output_variables_size(); i++) {
       RetrieveShaderOutputVariableInfo(
           proto->fragment_shader().output_variables(i),
           &fragment_output_variables);
     }
+    for (int i = 0; i < proto->fragment_shader().interface_blocks_size(); i++) {
+      RetrieveShaderInterfaceBlockInfo(
+          proto->fragment_shader().interface_blocks(i),
+          &fragment_interface_blocks);
+    }
 
     std::unique_ptr<char[]> binary(new char[proto->program().length()]);
     memcpy(binary.get(), proto->program().c_str(), proto->program().length());
 
     store_.Put(
         proto->sha(),
         new ProgramCacheValue(
             proto->program().length(), proto->format(), binary.release(),
             proto->sha(), proto->vertex_shader().sha().c_str(), vertex_attribs,
             vertex_uniforms, vertex_varyings, vertex_output_variables,
-            proto->fragment_shader().sha().c_str(), fragment_attribs,
-            fragment_uniforms, fragment_varyings, fragment_output_variables,
-            this));
+            vertex_interface_blocks, proto->fragment_shader().sha().c_str(),
+            fragment_attribs, fragment_uniforms, fragment_varyings,
+            fragment_output_variables, fragment_interface_blocks, this));
 
     UMA_HISTOGRAM_COUNTS("GPU.ProgramCache.MemorySizeAfterKb",
                          curr_size_bytes_ / 1024);
   } else {
     LOG(ERROR) << "Failed to parse proto file.";
   }
 }
 
 MemoryProgramCache::ProgramCacheValue::ProgramCacheValue(
     GLsizei length,
     GLenum format,
     const char* data,
     const std::string& program_hash,
     const char* shader_0_hash,
     const AttributeMap& attrib_map_0,
     const UniformMap& uniform_map_0,
     const VaryingMap& varying_map_0,
     const OutputVariableList& output_variable_list_0,
+    const InterfaceBlockMap& interface_block_map_0,
     const char* shader_1_hash,
     const AttributeMap& attrib_map_1,
     const UniformMap& uniform_map_1,
     const VaryingMap& varying_map_1,
     const OutputVariableList& output_variable_list_1,
+    const InterfaceBlockMap& interface_block_map_1,
     MemoryProgramCache* program_cache)
     : length_(length),
       format_(format),
       data_(data),
       program_hash_(program_hash),
       shader_0_hash_(shader_0_hash, kHashLength),
       attrib_map_0_(attrib_map_0),
       uniform_map_0_(uniform_map_0),
       varying_map_0_(varying_map_0),
       output_variable_list_0_(output_variable_list_0),
+      interface_block_map_0_(interface_block_map_0),
       shader_1_hash_(shader_1_hash, kHashLength),
       attrib_map_1_(attrib_map_1),
       uniform_map_1_(uniform_map_1),
       varying_map_1_(varying_map_1),
       output_variable_list_1_(output_variable_list_1),
+      interface_block_map_1_(interface_block_map_1),
       program_cache_(program_cache) {
   program_cache_->curr_size_bytes_ += length_;
   program_cache_->LinkedProgramCacheSuccess(program_hash);
 }
 
 MemoryProgramCache::ProgramCacheValue::~ProgramCacheValue() {
   program_cache_->curr_size_bytes_ -= length_;
   program_cache_->Evict(program_hash_);
 }
 
 }  // namespace gles2
 }  // namespace gpu