Implemented multisampling control in software rendering list. Move prelimina...

chrome/gpu/gpu_thread.cc

 // Copyright (c) 2010 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 "chrome/gpu/gpu_thread.h"
 
 #include <string>
 #include <vector>
 
 #include "app/gfx/gl/gl_context.h"
@@ skipping 103 matching lines @@
 
 }  // namespace
 
 void GpuThread::OnInitialize() {
   // Redirect LOG messages to the GpuProcessHost
   bool single_process = CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kSingleProcess);
   if (!single_process)
     logging::SetLogMessageHandler(GpuProcessLogMessageHandler);
 
-  // Collect as much GPU info as possible without creating GL/D3D context.
-  gpu_info_collector::CollectPreliminaryGraphicsInfo(&gpu_info_);
-  LOG(INFO) << "gpu_info_collector::CollectPreliminaryGraphicsInfo complete";
-
-  // Go through GPU blacklist with partial GPU info; if GPU is already
-  // blacklisted, don't create GL/D3D context.
-  bool blacklisted;
-  Send(new GpuHostMsg_PreliminaryGraphicsInfoCollected(gpu_info_,
-                                                       &blacklisted));
-  if (blacklisted) {
-    LOG(INFO) << "GPU is blacklisted based on preliminary GPU info collection";
-    MessageLoop::current()->Quit();
-    return;
-  }
-
   // Load the GL implementation and locate the bindings before starting the GPU
   // watchdog because this can take a lot of time and the GPU watchdog might
   // terminate the GPU process.
   if (!gfx::GLContext::InitializeOneOff()) {
     LOG(INFO) << "GLContext::InitializeOneOff failed";
     MessageLoop::current()->Quit();
     return;
   }
   bool gpu_info_result = gpu_info_collector::CollectGraphicsInfo(&gpu_info_);
   if (!gpu_info_result) {
@@ skipping 203 matching lines @@
 }
 
 // Runs on the GPU thread.
 void GpuThread::SetDxDiagnostics(GpuThread* thread, const DxDiagNode& node) {
   thread->gpu_info_.SetDxDiagnostics(node);
   thread->gpu_info_.SetLevel(GPUInfo::kComplete);
   thread->Send(new GpuHostMsg_GraphicsInfoCollected(thread->gpu_info_));
 }
 
 #endif