| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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_linux.h" | 5 #include "gpu/config/gpu_info_collector_linux.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 169 if (base::CommandLine::ForCurrentProcess()->HasSwitch( | 169 if (base::CommandLine::ForCurrentProcess()->HasSwitch( |
| 170 switches::kGpuNoContextLost)) { | 170 switches::kGpuNoContextLost)) { |
| 171 gpu_info->can_lose_context = false; | 171 gpu_info->can_lose_context = false; |
| 172 } else { | 172 } else { |
| 173 #if defined(OS_CHROMEOS) | 173 #if defined(OS_CHROMEOS) |
| 174 gpu_info->can_lose_context = false; | 174 gpu_info->can_lose_context = false; |
| 175 #else | 175 #else |
| 176 // TODO(zmo): need to consider the case where we are running on top | 176 // TODO(zmo): need to consider the case where we are running on top |
| 177 // of desktop GL and GL_ARB_robustness extension is available. | 177 // of desktop GL and GL_ARB_robustness extension is available. |
| 178 gpu_info->can_lose_context = | 178 gpu_info->can_lose_context = |
| 179 (gfx::GetGLImplementation() == gfx::kGLImplementationEGLGLES2); | 179 (gl::GetGLImplementation() == gl::kGLImplementationEGLGLES2); |
| 180 #endif | 180 #endif |
| 181 } | 181 } |
| 182 | 182 |
| 183 CollectInfoResult result = CollectGraphicsInfoGL(gpu_info); | 183 CollectInfoResult result = CollectGraphicsInfoGL(gpu_info); |
| 184 gpu_info->context_info_state = result; | 184 gpu_info->context_info_state = result; |
| 185 return result; | 185 return result; |
| 186 } | 186 } |
| 187 | 187 |
| 188 CollectInfoResult CollectGpuID(uint32_t* vendor_id, uint32_t* device_id) { | 188 CollectInfoResult CollectGpuID(uint32_t* vendor_id, uint32_t* device_id) { |
| 189 DCHECK(vendor_id && device_id); | 189 DCHECK(vendor_id && device_id); |
| (...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 268 gpu_info->driver_version = driver_version; | 268 gpu_info->driver_version = driver_version; |
| 269 return kCollectInfoSuccess; | 269 return kCollectInfoSuccess; |
| 270 } | 270 } |
| 271 | 271 |
| 272 void MergeGPUInfo(GPUInfo* basic_gpu_info, | 272 void MergeGPUInfo(GPUInfo* basic_gpu_info, |
| 273 const GPUInfo& context_gpu_info) { | 273 const GPUInfo& context_gpu_info) { |
| 274 MergeGPUInfoGL(basic_gpu_info, context_gpu_info); | 274 MergeGPUInfoGL(basic_gpu_info, context_gpu_info); |
| 275 } | 275 } |
| 276 | 276 |
| 277 } // namespace gpu | 277 } // namespace gpu |
| OLD | NEW |