Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(381)

Side by Side Diff: gpu/config/gpu_info_collector.cc

Issue 16293004: Update gpu/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « gpu/config/gpu_control_list_entry_unittest.cc ('k') | gpu/gles2_conform_support/egl/display.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/debug/trace_event.h" 10 #include "base/debug/trace_event.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/string_number_conversions.h" 13 #include "base/string_number_conversions.h"
14 #include "base/strings/string_piece.h" 14 #include "base/strings/string_piece.h"
15 #include "base/strings/string_split.h" 15 #include "base/strings/string_split.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(false, gfx::Size(1, 1))); 25 gfx::GLSurface::CreateOffscreenGLSurface(false, gfx::Size(1, 1)));
26 if (!surface) { 26 if (!surface.get()) {
27 LOG(ERROR) << "gfx::GLContext::CreateOffscreenGLSurface failed"; 27 LOG(ERROR) << "gfx::GLContext::CreateOffscreenGLSurface failed";
28 return NULL; 28 return NULL;
29 } 29 }
30 30
31 return surface; 31 return surface;
32 } 32 }
33 33
34 scoped_refptr<gfx::GLContext> InitializeGLContext(gfx::GLSurface* surface) { 34 scoped_refptr<gfx::GLContext> InitializeGLContext(gfx::GLSurface* surface) {
35 35
36 scoped_refptr<gfx::GLContext> context( 36 scoped_refptr<gfx::GLContext> context(
37 gfx::GLContext::CreateGLContext(NULL, 37 gfx::GLContext::CreateGLContext(NULL,
38 surface, 38 surface,
39 gfx::PreferIntegratedGpu)); 39 gfx::PreferIntegratedGpu));
40 if (!context) { 40 if (!context.get()) {
41 LOG(ERROR) << "gfx::GLContext::CreateGLContext failed"; 41 LOG(ERROR) << "gfx::GLContext::CreateGLContext failed";
42 return NULL; 42 return NULL;
43 } 43 }
44 44
45 if (!context->MakeCurrent(surface)) { 45 if (!context->MakeCurrent(surface)) {
46 LOG(ERROR) << "gfx::GLContext::MakeCurrent() failed"; 46 LOG(ERROR) << "gfx::GLContext::MakeCurrent() failed";
47 return NULL; 47 return NULL;
48 } 48 }
49 49
50 return context; 50 return context;
(...skipping 30 matching lines...) Expand all
81 namespace gpu { 81 namespace gpu {
82 82
83 bool CollectGraphicsInfoGL(GPUInfo* gpu_info) { 83 bool CollectGraphicsInfoGL(GPUInfo* gpu_info) {
84 TRACE_EVENT0("startup", "gpu_info_collector::CollectGraphicsInfoGL"); 84 TRACE_EVENT0("startup", "gpu_info_collector::CollectGraphicsInfoGL");
85 if (!gfx::GLSurface::InitializeOneOff()) { 85 if (!gfx::GLSurface::InitializeOneOff()) {
86 LOG(ERROR) << "gfx::GLSurface::InitializeOneOff() failed"; 86 LOG(ERROR) << "gfx::GLSurface::InitializeOneOff() failed";
87 return false; 87 return false;
88 } 88 }
89 89
90 scoped_refptr<gfx::GLSurface> surface(InitializeGLSurface()); 90 scoped_refptr<gfx::GLSurface> surface(InitializeGLSurface());
91 if (!surface) 91 if (!surface.get())
92 return false; 92 return false;
93 93
94 scoped_refptr<gfx::GLContext> context(InitializeGLContext(surface.get())); 94 scoped_refptr<gfx::GLContext> context(InitializeGLContext(surface.get()));
95 if (!context) 95 if (!context.get())
96 return false; 96 return false;
97 97
98 gpu_info->gl_renderer = GetGLString(GL_RENDERER); 98 gpu_info->gl_renderer = GetGLString(GL_RENDERER);
99 gpu_info->gl_vendor = GetGLString(GL_VENDOR); 99 gpu_info->gl_vendor = GetGLString(GL_VENDOR);
100 gpu_info->gl_extensions = GetGLString(GL_EXTENSIONS); 100 gpu_info->gl_extensions = GetGLString(GL_EXTENSIONS);
101 gpu_info->gl_version_string = GetGLString(GL_VERSION); 101 gpu_info->gl_version_string = GetGLString(GL_VERSION);
102 std::string glsl_version_string = GetGLString(GL_SHADING_LANGUAGE_VERSION); 102 std::string glsl_version_string = GetGLString(GL_SHADING_LANGUAGE_VERSION);
103 103
104 gfx::GLWindowSystemBindingInfo window_system_binding_info; 104 gfx::GLWindowSystemBindingInfo window_system_binding_info;
105 if (GetGLWindowSystemBindingInfo(&window_system_binding_info)) { 105 if (GetGLWindowSystemBindingInfo(&window_system_binding_info)) {
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 143
144 basic_gpu_info->can_lose_context = context_gpu_info.can_lose_context; 144 basic_gpu_info->can_lose_context = context_gpu_info.can_lose_context;
145 basic_gpu_info->sandboxed = context_gpu_info.sandboxed; 145 basic_gpu_info->sandboxed = context_gpu_info.sandboxed;
146 basic_gpu_info->gpu_accessible = context_gpu_info.gpu_accessible; 146 basic_gpu_info->gpu_accessible = context_gpu_info.gpu_accessible;
147 basic_gpu_info->finalized = context_gpu_info.finalized; 147 basic_gpu_info->finalized = context_gpu_info.finalized;
148 basic_gpu_info->initialization_time = context_gpu_info.initialization_time; 148 basic_gpu_info->initialization_time = context_gpu_info.initialization_time;
149 } 149 }
150 150
151 } // namespace gpu 151 } // namespace gpu
152 152
OLDNEW
« no previous file with comments | « gpu/config/gpu_control_list_entry_unittest.cc ('k') | gpu/gles2_conform_support/egl/display.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698