command_buffer: Implement EXT_blend_func_extended

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 "base/base64.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
@@ skipping 22 matching lines @@
   return gpu::kDefaultMaxProgramCacheMemoryBytes;
 }
 
 }  // anonymous namespace
 
 namespace gpu {
 namespace gles2 {
 
 namespace {
 
-enum ShaderMapType {
-  ATTRIB_MAP = 0,
-  UNIFORM_MAP,
-  VARYING_MAP

[Mark Kilgard, 2015/08/28 19:53:24]

agreed, never used later

-};
-
 void FillShaderVariableProto(
     ShaderVariableProto* proto, const sh::ShaderVariable& variable) {
   proto->set_type(variable.type);
   proto->set_precision(variable.precision);
   proto->set_name(variable.name);
   proto->set_mapped_name(variable.mappedName);
   proto->set_array_size(variable.arraySize);
   proto->set_static_use(variable.staticUse);
   for (size_t ii = 0; ii < variable.fields.size(); ++ii) {
     ShaderVariableProto* field = proto->add_fields();
@@ skipping 31 matching lines @@
   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) {
+    ShaderAttributeProto* info = proto->add_output_variables();
+    FillShaderAttributeProto(info, *iter);
+  }
 }
 
 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();
   variable->fields.resize(proto.fields_size());
   for (int ii = 0; ii < proto.fields_size(); ++ii)
     RetrieveShaderVariableInfo(proto.fields(ii), &(variable->fields[ii]));
   variable->structName = proto.struct_name();
 }
 
 void RetrieveShaderAttributeInfo(
     const ShaderAttributeProto& proto, AttributeMap* map) {
   sh::Attribute attrib;
   RetrieveShaderVariableInfo(proto.basic(), &attrib);
   attrib.location = proto.location();
   (*map)[proto.basic().mapped_name()] = attrib;
 }
 
+void RetrieveShaderOutputVariableInfo(const ShaderAttributeProto& proto,
+                                      AttributeList* list) {
+  sh::Attribute attrib;
+  RetrieveShaderVariableInfo(proto.basic(), &attrib);
+  attrib.location = proto.location();
+  list->push_back(attrib);
+}
+
 void RetrieveShaderUniformInfo(
     const ShaderUniformProto& proto, UniformMap* map) {
   sh::Uniform uniform;
   RetrieveShaderVariableInfo(proto.basic(), &uniform);
   (*map)[proto.basic().mapped_name()] = uniform;
 }
 
 void RetrieveShaderVaryingInfo(
     const ShaderVaryingProto& proto, VaryingMap* map) {
   sh::Varying varying;
@@ skipping 72 matching lines @@
                   static_cast<const GLvoid*>(value->data()),
                   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_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());
 
   if (!shader_callback.is_null() &&
       !base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableGpuShaderDiskCache)) {
     scoped_ptr<GpuProgramProto> proto(
         GpuProgramProto::default_instance().New());
     proto->set_sha(sha, kHashLength);
     proto->set_format(value->format());
     proto->set_program(value->data(), value->length());
 
@@ skipping 66 matching lines @@
         GpuProgramProto::default_instance().New());
     proto->set_sha(sha, kHashLength);
     proto->set_format(format);
     proto->set_program(binary.get(), length);
 
     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(),
-                                   b_sha,
-                                   shader_b->attrib_map(),
-                                   shader_b->uniform_map(),
-                                   shader_b->varying_map(),
-                                   this));
+  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_b->attrib_map(), shader_b->uniform_map(),
+          shader_b->varying_map(), shader_b->output_variable_list(), this));
 
   UMA_HISTOGRAM_COUNTS("GPU.ProgramCache.MemorySizeAfterKb",
                        curr_size_bytes_ / 1024);
 }
 
 void MemoryProgramCache::LoadProgram(const std::string& program) {
   scoped_ptr<GpuProgramProto> proto(GpuProgramProto::default_instance().New());
   if (proto->ParseFromString(program)) {
     AttributeMap vertex_attribs;
     UniformMap vertex_uniforms;
     VaryingMap vertex_varyings;
+    AttributeList vertex_output_variables;
     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);
+    }
 
     AttributeMap fragment_attribs;
     UniformMap fragment_uniforms;
     VaryingMap fragment_varyings;
+    AttributeList fragment_output_variables;
     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);
+    }
 
     scoped_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,
-                                     proto->fragment_shader().sha().c_str(),
-                                     fragment_attribs,
-                                     fragment_uniforms,
-                                     fragment_varyings,
-                                     this));
+    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));

[Mark Kilgard, 2015/08/28 19:53:24]

ignoring the code reformatting clean-up, the substantive change is adding
"fragment_output_variables"

 
     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 AttributeList& output_variable_list_0,
     const char* shader_1_hash,
     const AttributeMap& attrib_map_1,
     const UniformMap& uniform_map_1,
     const VaryingMap& varying_map_1,
+    const AttributeList& output_variable_list_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),
       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),
       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