Add pixel shader version to GPU control list

gpu/config/gpu_control_list.cc

 // Copyright (c) 2013 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/config/gpu_control_list.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <utility>
@@ skipping 727 matching lines @@
     entry->SetDirectRenderingInfo(direct_rendering);
     dictionary_entry_count++;
   }
 
   bool in_process_gpu;
   if (value->GetBoolean("in_process_gpu", &in_process_gpu)) {
     entry->SetInProcessGPUInfo(in_process_gpu);
     dictionary_entry_count++;
   }
 
+  const base::DictionaryValue* pixel_shader_version_value = NULL;
+  if (value->GetDictionary("pixel_shader_version",
+                           &pixel_shader_version_value)) {
+    std::string pixel_shader_version_op = "any";
+    std::string pixel_shader_version_string;
+    std::string pixel_shader_version_string2;
+    pixel_shader_version_value->GetString(kOp, &pixel_shader_version_op);
+    pixel_shader_version_value->GetString("value",
+                                          &pixel_shader_version_string);
+    pixel_shader_version_value->GetString("value2",
+                                          &pixel_shader_version_string2);
+    if (!entry->SetPixelShaderVersionInfo(pixel_shader_version_op,
+                                          pixel_shader_version_string,
+                                          pixel_shader_version_string2)) {
+      LOG(WARNING) << "Malformed pixel shader version entry " << entry->id();
+      return NULL;
+    }
+    dictionary_entry_count++;
+  }
+
   if (top_level) {
     const base::ListValue* feature_value = NULL;
     if (value->GetList("features", &feature_value)) {
       std::vector<std::string> feature_list;
       std::vector<std::string> feature_exception_list;
       for (size_t i = 0; i < feature_value->GetSize(); ++i) {
         std::string feature;
         const base::DictionaryValue* features_info_value = NULL;
         if (feature_value->GetString(i, &feature)) {
           feature_list.push_back(feature);
@@ skipping 301 matching lines @@
       features_.clear();
       return false;
     }
     if (std::find(exception_strings.begin(), exception_strings.end(),
                   feature_strings[i]) == exception_strings.end())
       features_.insert(feature);
   }
   return true;
 }
 
+bool GpuControlList::GpuControlListEntry::SetPixelShaderVersionInfo(
+    const std::string& version_op,
+    const std::string& version_string,
+    const std::string& version_string2) {
+  pixel_shader_version_info_.reset(new VersionInfo(
+      version_op, std::string(), version_string, version_string2));
+  return pixel_shader_version_info_->IsValid();
+}
+
 void GpuControlList::GpuControlListEntry::AddException(
     ScopedGpuControlListEntry exception) {
   exceptions_.push_back(exception);
 }
 
 bool GpuControlList::GpuControlListEntry::GLVersionInfoMismatch(
     const std::string& gl_version) const {
   if (gl_version.empty())
     return false;
 
@@ skipping 230 matching lines @@
       !direct_rendering_info_->Contains(gpu_info.direct_rendering))
     return false;
   if (in_process_gpu_info_.get() != NULL &&
       !in_process_gpu_info_->Contains(gpu_info.in_process_gpu))
     return false;
   if (!cpu_brand_.empty()) {
     base::CPU cpu_info;
     if (StringMismatch(cpu_info.cpu_brand(), cpu_brand_))
       return false;
   }
+  if (pixel_shader_version_info_.get() != NULL) {
+    if (!pixel_shader_version_info_->Contains(gpu_info.pixel_shader_version))
+      return false;
+  }
 
   for (size_t i = 0; i < exceptions_.size(); ++i) {
     if (exceptions_[i]->Contains(os_type, os_version, gpu_info) &&
         !exceptions_[i]->NeedsMoreInfo(gpu_info, true))
       return false;
   }
   return true;
 }
 
 bool GpuControlList::GpuControlListEntry::NeedsMoreInfo(
     const GPUInfo& gpu_info,
     bool consider_exceptions) const {
   // We only check for missing info that might be collected with a gl context.
   // If certain info is missing due to some error, say, we fail to collect
   // vendor_id/device_id, then even if we launch GPU process and create a gl
   // context, we won't gather such missing info, so we still return false.
   if (!driver_vendor_info_.empty() && gpu_info.driver_vendor.empty())
     return true;
   if (driver_version_info_.get() && gpu_info.driver_version.empty())
     return true;
   if ((gl_version_info_.get() || !gl_version_string_info_.empty()) &&
       gpu_info.gl_version.empty()) {
     return true;
   }
   if (!gl_vendor_info_.empty() && gpu_info.gl_vendor.empty())
     return true;
   if (!gl_renderer_info_.empty() && gpu_info.gl_renderer.empty())
     return true;
+  if (pixel_shader_version_info_.get() != NULL &&
+      gpu_info.pixel_shader_version.empty())
+    return true;
 
   if (consider_exceptions) {
     for (size_t i = 0; i < exceptions_.size(); ++i) {
       if (exceptions_[i]->NeedsMoreInfo(gpu_info, consider_exceptions))
         return true;
     }
   }
 
   return false;
 }
@@ skipping 288 matching lines @@
     const std::string& feature_name, int feature_id) {
   feature_map_[feature_name] = feature_id;
 }
 
 void GpuControlList::set_supports_feature_type_all(bool supported) {
   supports_feature_type_all_ = supported;
 }
 
 }  // namespace gpu