summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/chrome.gyp1
-rw-r--r--chrome/gpu/gpu_info.cc36
-rw-r--r--chrome/gpu/gpu_info_win.cc31
3 files changed, 37 insertions, 31 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index d87ec30..9972502 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -690,6 +690,7 @@
'gpu/gpu_config.h',
'gpu/gpu_info_win.cc',
'gpu/gpu_info.h',
+ 'gpu/gpu_info.cc',
'gpu/gpu_main.cc',
'gpu/gpu_process.cc',
'gpu/gpu_process.h',
diff --git a/chrome/gpu/gpu_info.cc b/chrome/gpu/gpu_info.cc
new file mode 100644
index 0000000..36ff12a
--- /dev/null
+++ b/chrome/gpu/gpu_info.cc
@@ -0,0 +1,36 @@
+// Copyright (c) 2006-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_info.h"
+
+uint32 GPUInfo::vendor_id() const {
+ return vendor_id_;
+}
+
+uint32 GPUInfo::device_id() const {
+ return device_id_;
+}
+
+std::wstring GPUInfo::driver_version() const {
+ return driver_version_;
+}
+
+uint32 GPUInfo::pixel_shader_version() const {
+ return pixel_shader_version_;
+}
+
+uint32 GPUInfo::vertex_shader_version() const {
+ return vertex_shader_version_;
+}
+
+void GPUInfo::SetGraphicsInfo(uint32 vendor_id, uint32 device_id,
+ const std::wstring& driver_version,
+ uint32 pixel_shader_version,
+ uint32 vertex_shader_version) {
+ vendor_id_ = vendor_id;
+ device_id_ = device_id;
+ driver_version_ = driver_version;
+ pixel_shader_version_ = pixel_shader_version;
+ vertex_shader_version_ = vertex_shader_version;
+}
diff --git a/chrome/gpu/gpu_info_win.cc b/chrome/gpu/gpu_info_win.cc
index f2a9dec..529b1ab 100644
--- a/chrome/gpu/gpu_info_win.cc
+++ b/chrome/gpu/gpu_info_win.cc
@@ -11,37 +11,6 @@
#include "base/scoped_native_library.h"
#include "base/string_util.h"
-uint32 GPUInfo::vendor_id() const {
- return vendor_id_;
-}
-
-uint32 GPUInfo::device_id() const {
- return device_id_;
-}
-
-std::wstring GPUInfo::driver_version() const {
- return driver_version_;
-}
-
-uint32 GPUInfo::pixel_shader_version() const {
- return pixel_shader_version_;
-}
-
-uint32 GPUInfo::vertex_shader_version() const {
- return vertex_shader_version_;
-}
-
-void GPUInfo::SetGraphicsInfo(uint32 vendor_id, uint32 device_id,
- const std::wstring& driver_version,
- uint32 pixel_shader_version,
- uint32 vertex_shader_version) {
- vendor_id_ = vendor_id;
- device_id_ = device_id;
- driver_version_ = driver_version;
- pixel_shader_version_ = pixel_shader_version;
- vertex_shader_version_ = vertex_shader_version;
-}
-
bool GPUInfo::CollectGraphicsInfo() {
FilePath d3d_path(base::GetNativeLibraryName(L"d3d9"));
base::ScopedNativeLibrary d3dlib(d3d_path);