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 <string> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
11 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
12 #include "base/strings/string_number_conversions.h" | 12 #include "base/strings/string_number_conversions.h" |
13 #include "base/strings/string_piece.h" | 13 #include "base/strings/string_piece.h" |
14 #include "base/strings/string_split.h" | 14 #include "base/strings/string_split.h" |
15 #include "base/trace_event/trace_event.h" | 15 #include "base/trace_event/trace_event.h" |
16 #include "ui/gl/gl_bindings.h" | 16 #include "ui/gl/gl_bindings.h" |
17 #include "ui/gl/gl_context.h" | 17 #include "ui/gl/gl_context.h" |
18 #include "ui/gl/gl_implementation.h" | 18 #include "ui/gl/gl_implementation.h" |
19 #include "ui/gl/gl_surface.h" | 19 #include "ui/gl/gl_surface.h" |
20 | 20 |
21 namespace { | 21 namespace { |
22 | 22 |
23 scoped_refptr<gfx::GLSurface> InitializeGLSurface() { | 23 scoped_refptr<gfx::GLSurface> InitializeGLSurface() { |
24 scoped_refptr<gfx::GLSurface> surface( | 24 scoped_refptr<gfx::GLSurface> surface( |
25 gfx::GLSurface::CreateOffscreenGLSurface(gfx::Size())); | 25 gfx::GLSurface::CreateOffscreenGLSurface(gfx::Size(), |
| 26 gfx::SurfaceConfiguration())); |
26 if (!surface.get()) { | 27 if (!surface.get()) { |
27 LOG(ERROR) << "gfx::GLContext::CreateOffscreenGLSurface failed"; | 28 LOG(ERROR) << "gfx::GLContext::CreateOffscreenGLSurface failed"; |
28 return NULL; | 29 return NULL; |
29 } | 30 } |
30 | 31 |
31 return surface; | 32 return surface; |
32 } | 33 } |
33 | 34 |
34 scoped_refptr<gfx::GLContext> InitializeGLContext(gfx::GLSurface* surface) { | 35 scoped_refptr<gfx::GLContext> InitializeGLContext(gfx::GLSurface* surface) { |
35 | 36 |
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
156 basic_gpu_info->sandboxed = context_gpu_info.sandboxed; | 157 basic_gpu_info->sandboxed = context_gpu_info.sandboxed; |
157 basic_gpu_info->direct_rendering = context_gpu_info.direct_rendering; | 158 basic_gpu_info->direct_rendering = context_gpu_info.direct_rendering; |
158 basic_gpu_info->context_info_state = context_gpu_info.context_info_state; | 159 basic_gpu_info->context_info_state = context_gpu_info.context_info_state; |
159 basic_gpu_info->initialization_time = context_gpu_info.initialization_time; | 160 basic_gpu_info->initialization_time = context_gpu_info.initialization_time; |
160 basic_gpu_info->video_encode_accelerator_supported_profiles = | 161 basic_gpu_info->video_encode_accelerator_supported_profiles = |
161 context_gpu_info.video_encode_accelerator_supported_profiles; | 162 context_gpu_info.video_encode_accelerator_supported_profiles; |
162 } | 163 } |
163 | 164 |
164 } // namespace gpu | 165 } // namespace gpu |
165 | 166 |
OLD | NEW |