commit b7a64d5752ffb18bd7916eda0977222a8085bace
author senorblanco <senorblanco@chromium.org> Wed Apr 08 16:59:02 2015
committer Commit bot <commit-bot@chromium.org> Wed Apr 08 16:59:41 2015
tree 846cc9209047da1576cbf39c0fabf53b96ff190e
parent d4a43f2240f2ea3332a2a9f552e7983e8b61c301

Add a "Max. MSAA samples" entry to chrome://gpu.

BUG=474727

Review URL: https://codereview.chromium.org/1063233002

Cr-Commit-Position: refs/heads/master@{#324236}

gpu/config/gpu_info_collector.cc

diff --git a/gpu/config/gpu_info_collector.cc b/gpu/config/gpu_info_collector.cc
index 521f2cd..c673057 100644
--- a/gpu/config/gpu_info_collector.cc
+++ b/gpu/config/gpu_info_collector.cc
@@ -12,6 +12,7 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/string_split.h"
+#include "base/strings/stringprintf.h"
 #include "base/trace_event/trace_event.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_context.h"
@@ -101,6 +102,9 @@
   gpu_info->gl_extensions = GetGLString(GL_EXTENSIONS);
   gpu_info->gl_version = GetGLString(GL_VERSION);
   std::string glsl_version_string = GetGLString(GL_SHADING_LANGUAGE_VERSION);
+  GLint max_samples = 0;
+  glGetIntegerv(GL_MAX_SAMPLES, &max_samples);
+  gpu_info->max_msaa_samples = base::StringPrintf("%d", max_samples);
 
   gfx::GLWindowSystemBindingInfo window_system_binding_info;
   if (GetGLWindowSystemBindingInfo(&window_system_binding_info)) {
@@ -141,6 +145,8 @@
       context_gpu_info.pixel_shader_version;
   basic_gpu_info->vertex_shader_version =
       context_gpu_info.vertex_shader_version;
+  basic_gpu_info->max_msaa_samples =
+      context_gpu_info.max_msaa_samples;
   basic_gpu_info->gl_ws_vendor = context_gpu_info.gl_ws_vendor;
   basic_gpu_info->gl_ws_version = context_gpu_info.gl_ws_version;
   basic_gpu_info->gl_ws_extensions = context_gpu_info.gl_ws_extensions;