X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fgpu%2Fconfig%2Fgpu_info_collector_x11.cc;h=38fa72f74dc82b18a573c12810e08ae18c7c50b8;hb=4a1a0bdd01eef90b0826a0e761d3379d3715c10f;hp=5d29d384cdc73d041c1e8fb1d51d3392c4a68673;hpb=b1be5ca53587d23e7aeb77b26861fdc0a181ffd8;p=platform%2Fframework%2Fweb%2Fcrosswalk.git

diff --git a/src/gpu/config/gpu_info_collector_x11.cc b/src/gpu/config/gpu_info_collector_x11.cc
index 5d29d38..38fa72f 100644
--- a/src/gpu/config/gpu_info_collector_x11.cc
+++ b/src/gpu/config/gpu_info_collector_x11.cc
@@ -1,73 +1,17 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 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_info_collector.h"
-
 #include <X11/Xlib.h>
-#include <vector>
 
-#include "base/command_line.h"
-#include "base/debug/trace_event.h"
-#include "base/file_util.h"
 #include "base/logging.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/message_loop/message_loop.h"
-#include "base/strings/string_piece.h"
-#include "base/strings/string_split.h"
-#include "base/strings/string_tokenizer.h"
-#include "base/strings/string_util.h"
-#include "library_loaders/libpci.h"
+#include "gpu/config/gpu_info_collector_linux.h"
 #include "third_party/libXNVCtrl/NVCtrl.h"
 #include "third_party/libXNVCtrl/NVCtrlLib.h"
 #include "ui/gfx/x/x11_types.h"
-#include "ui/gl/gl_bindings.h"
-#include "ui/gl/gl_context.h"
-#include "ui/gl/gl_implementation.h"
-#include "ui/gl/gl_surface.h"
-#include "ui/gl/gl_switches.h"
 
 namespace gpu {
 
-namespace {
-
-// This checks if a system supports PCI bus.
-// We check the existence of /sys/bus/pci or /sys/bug/pci_express.
-bool IsPciSupported() {
-  const base::FilePath pci_path("/sys/bus/pci/");
-  const base::FilePath pcie_path("/sys/bus/pci_express/");
-  return (base::PathExists(pci_path) ||
-          base::PathExists(pcie_path));
-}
-
-// Scan /etc/ati/amdpcsdb.default for "ReleaseVersion".
-// Return empty string on failing.
-std::string CollectDriverVersionATI() {
-  const base::FilePath::CharType kATIFileName[] =
-      FILE_PATH_LITERAL("/etc/ati/amdpcsdb.default");
-  base::FilePath ati_file_path(kATIFileName);
-  if (!base::PathExists(ati_file_path))
-    return std::string();
-  std::string contents;
-  if (!base::ReadFileToString(ati_file_path, &contents))
-    return std::string();
-  base::StringTokenizer t(contents, "\r\n");
-  while (t.GetNext()) {
-    std::string line = t.token();
-    if (StartsWithASCII(line, "ReleaseVersion=", true)) {
-      size_t begin = line.find_first_of("0123456789");
-      if (begin != std::string::npos) {
-        size_t end = line.find_first_not_of("0123456789.", begin);
-        if (end == std::string::npos)
-          return line.substr(begin);
-        else
-          return line.substr(begin, end - begin);
-      }
-    }
-  }
-  return std::string();
-}
-
 // Use NVCtrl extention to query NV driver version.
 // Return empty string on failing.
 std::string CollectDriverVersionNVidia() {
@@ -96,195 +40,4 @@ std::string CollectDriverVersionNVidia() {
   return std::string();
 }
 
-const uint32 kVendorIDIntel = 0x8086;
-const uint32 kVendorIDNVidia = 0x10de;
-const uint32 kVendorIDAMD = 0x1002;
-
-bool CollectPCIVideoCardInfo(GPUInfo* gpu_info) {
-  DCHECK(gpu_info);
-
-  if (IsPciSupported() == false) {
-    VLOG(1) << "PCI bus scanning is not supported";
-    return false;
-  }
-
-  // TODO(zmo): be more flexible about library name.
-  LibPciLoader libpci_loader;
-  if (!libpci_loader.Load("libpci.so.3") &&
-      !libpci_loader.Load("libpci.so")) {
-    VLOG(1) << "Failed to locate libpci";
-    return false;
-  }
-
-  pci_access* access = (libpci_loader.pci_alloc)();
-  DCHECK(access != NULL);
-  (libpci_loader.pci_init)(access);
-  (libpci_loader.pci_scan_bus)(access);
-  bool primary_gpu_identified = false;
-  for (pci_dev* device = access->devices;
-       device != NULL; device = device->next) {
-    // Fill the IDs and class fields.
-    (libpci_loader.pci_fill_info)(device, 33);
-    bool is_gpu = false;
-    switch (device->device_class) {
-      case PCI_CLASS_DISPLAY_VGA:
-      case PCI_CLASS_DISPLAY_XGA:
-      case PCI_CLASS_DISPLAY_3D:
-        is_gpu = true;
-        break;
-      case PCI_CLASS_DISPLAY_OTHER:
-      default:
-        break;
-    }
-    if (!is_gpu)
-      continue;
-
-    GPUInfo::GPUDevice gpu;
-    gpu.vendor_id = device->vendor_id;
-    gpu.device_id = device->device_id;
-
-    if (!primary_gpu_identified) {
-      primary_gpu_identified = true;
-      gpu_info->gpu = gpu;
-    } else {
-      // TODO(zmo): if there are multiple GPUs, we assume the non Intel
-      // one is primary. Revisit this logic because we actually don't know
-      // which GPU we are using at this point.
-      if (gpu_info->gpu.vendor_id == kVendorIDIntel &&
-          gpu.vendor_id != kVendorIDIntel) {
-        gpu_info->secondary_gpus.push_back(gpu_info->gpu);
-        gpu_info->gpu = gpu;
-      } else {
-        gpu_info->secondary_gpus.push_back(gpu);
-      }
-    }
-  }
-
-  // Detect Optimus or AMD Switchable GPU.
-  if (gpu_info->secondary_gpus.size() == 1 &&
-      gpu_info->secondary_gpus[0].vendor_id == kVendorIDIntel) {
-    if (gpu_info->gpu.vendor_id == kVendorIDNVidia)
-      gpu_info->optimus = true;
-    if (gpu_info->gpu.vendor_id == kVendorIDAMD)
-      gpu_info->amd_switchable = true;
-  }
-
-  (libpci_loader.pci_cleanup)(access);
-  return (primary_gpu_identified);
-}
-
-}  // namespace anonymous
-
-CollectInfoResult CollectContextGraphicsInfo(GPUInfo* gpu_info) {
-  DCHECK(gpu_info);
-
-  TRACE_EVENT0("gpu", "gpu_info_collector::CollectGraphicsInfo");
-
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kGpuNoContextLost)) {
-    gpu_info->can_lose_context = false;
-  } else {
-#if defined(OS_CHROMEOS)
-    gpu_info->can_lose_context = false;
-#else
-    // TODO(zmo): need to consider the case where we are running on top
-    // of desktop GL and GL_ARB_robustness extension is available.
-    gpu_info->can_lose_context =
-        (gfx::GetGLImplementation() == gfx::kGLImplementationEGLGLES2);
-#endif
-  }
-
-  CollectInfoResult result = CollectGraphicsInfoGL(gpu_info);
-  gpu_info->finalized = true;
-  return result;
-}
-
-GpuIDResult CollectGpuID(uint32* vendor_id, uint32* device_id) {
-  DCHECK(vendor_id && device_id);
-  *vendor_id = 0;
-  *device_id = 0;
-
-  GPUInfo gpu_info;
-  if (CollectPCIVideoCardInfo(&gpu_info)) {
-    *vendor_id = gpu_info.gpu.vendor_id;
-    *device_id = gpu_info.gpu.device_id;
-    if (*vendor_id != 0 && *device_id != 0)
-      return kGpuIDSuccess;
-  }
-  return kGpuIDFailure;
-}
-
-CollectInfoResult CollectBasicGraphicsInfo(GPUInfo* gpu_info) {
-  DCHECK(gpu_info);
-
-  bool rt = CollectPCIVideoCardInfo(gpu_info);
-
-  std::string driver_version;
-  switch (gpu_info->gpu.vendor_id) {
-    case kVendorIDAMD:
-      driver_version = CollectDriverVersionATI();
-      if (!driver_version.empty()) {
-        gpu_info->driver_vendor = "ATI / AMD";
-        gpu_info->driver_version = driver_version;
-      }
-      break;
-    case kVendorIDNVidia:
-      driver_version = CollectDriverVersionNVidia();
-      if (!driver_version.empty()) {
-        gpu_info->driver_vendor = "NVIDIA";
-        gpu_info->driver_version = driver_version;
-      }
-      break;
-    case kVendorIDIntel:
-      // In dual-GPU cases, sometimes PCI scan only gives us the
-      // integrated GPU (i.e., the Intel one).
-      if (gpu_info->secondary_gpus.size() == 0) {
-        driver_version = CollectDriverVersionNVidia();
-        if (!driver_version.empty()) {
-          gpu_info->driver_vendor = "NVIDIA";
-          gpu_info->driver_version = driver_version;
-          gpu_info->optimus = true;
-          // Put Intel to the secondary GPU list.
-          gpu_info->secondary_gpus.push_back(gpu_info->gpu);
-          // Put NVIDIA as the primary GPU.
-          gpu_info->gpu.vendor_id = kVendorIDNVidia;
-          gpu_info->gpu.device_id = 0;  // Unknown Device.
-        }
-      }
-      break;
-  }
-
-  return rt ? kCollectInfoSuccess : kCollectInfoNonFatalFailure;
-}
-
-CollectInfoResult CollectDriverInfoGL(GPUInfo* gpu_info) {
-  DCHECK(gpu_info);
-
-  std::string gl_version = gpu_info->gl_version;
-  if (StartsWithASCII(gl_version, "OpenGL ES", true))
-    gl_version = gl_version.substr(10);
-  std::vector<std::string> pieces;
-  base::SplitStringAlongWhitespace(gl_version, &pieces);
-  // In linux, the gl version string might be in the format of
-  //   GLVersion DriverVendor DriverVersion
-  if (pieces.size() < 3)
-    return kCollectInfoNonFatalFailure;
-
-  std::string driver_version = pieces[2];
-  size_t pos = driver_version.find_first_not_of("0123456789.");
-  if (pos == 0)
-    return kCollectInfoNonFatalFailure;
-  if (pos != std::string::npos)
-    driver_version = driver_version.substr(0, pos);
-
-  gpu_info->driver_vendor = pieces[1];
-  gpu_info->driver_version = driver_version;
-  return kCollectInfoSuccess;
-}
-
-void MergeGPUInfo(GPUInfo* basic_gpu_info,
-                  const GPUInfo& context_gpu_info) {
-  MergeGPUInfoGL(basic_gpu_info, context_gpu_info);
-}
-
 }  // namespace gpu