| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "gpu/config/gpu_info_collector.h" | 5 #include "gpu/config/gpu_info_collector.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/mac/mac_util.h" | 10 #include "base/mac/mac_util.h" |
| (...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 163 } | 163 } |
| 164 | 164 |
| 165 } // namespace anonymous | 165 } // namespace anonymous |
| 166 | 166 |
| 167 CollectInfoResult CollectContextGraphicsInfo(GPUInfo* gpu_info) { | 167 CollectInfoResult CollectContextGraphicsInfo(GPUInfo* gpu_info) { |
| 168 DCHECK(gpu_info); | 168 DCHECK(gpu_info); |
| 169 | 169 |
| 170 TRACE_EVENT0("gpu", "gpu_info_collector::CollectGraphicsInfo"); | 170 TRACE_EVENT0("gpu", "gpu_info_collector::CollectGraphicsInfo"); |
| 171 | 171 |
| 172 gpu_info->can_lose_context = | 172 gpu_info->can_lose_context = |
| 173 (gfx::GetGLImplementation() == gfx::kGLImplementationEGLGLES2); | 173 (gl::GetGLImplementation() == gl::kGLImplementationEGLGLES2); |
| 174 CollectInfoResult result = CollectGraphicsInfoGL(gpu_info); | 174 CollectInfoResult result = CollectGraphicsInfoGL(gpu_info); |
| 175 gpu_info->context_info_state = result; | 175 gpu_info->context_info_state = result; |
| 176 return result; | 176 return result; |
| 177 } | 177 } |
| 178 | 178 |
| 179 CollectInfoResult CollectGpuID(uint32_t* vendor_id, uint32_t* device_id) { | 179 CollectInfoResult CollectGpuID(uint32_t* vendor_id, uint32_t* device_id) { |
| 180 DCHECK(vendor_id && device_id); | 180 DCHECK(vendor_id && device_id); |
| 181 | 181 |
| 182 GPUInfo::GPUDevice gpu = GetActiveGPU(); | 182 GPUInfo::GPUDevice gpu = GetActiveGPU(); |
| 183 *vendor_id = gpu.vendor_id; | 183 *vendor_id = gpu.vendor_id; |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 216 gpu_info->driver_version = gpu_info->gl_version.substr(pos + 1); | 216 gpu_info->driver_version = gpu_info->gl_version.substr(pos + 1); |
| 217 return kCollectInfoSuccess; | 217 return kCollectInfoSuccess; |
| 218 } | 218 } |
| 219 | 219 |
| 220 void MergeGPUInfo(GPUInfo* basic_gpu_info, | 220 void MergeGPUInfo(GPUInfo* basic_gpu_info, |
| 221 const GPUInfo& context_gpu_info) { | 221 const GPUInfo& context_gpu_info) { |
| 222 MergeGPUInfoGL(basic_gpu_info, context_gpu_info); | 222 MergeGPUInfoGL(basic_gpu_info, context_gpu_info); |
| 223 } | 223 } |
| 224 | 224 |
| 225 } // namespace gpu | 225 } // namespace gpu |
| OLD | NEW |