| 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 "ui/gl/gl_surface.h" | 5 #include "ui/gl/gl_surface.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 59 if (!initialized && fallback_to_osmesa) { | 59 if (!initialized && fallback_to_osmesa) { |
| 60 ClearGLBindings(); | 60 ClearGLBindings(); |
| 61 initialized = InitializeGLBindings(kGLImplementationOSMesaGL) && | 61 initialized = InitializeGLBindings(kGLImplementationOSMesaGL) && |
| 62 InitializeOneOffInternal(); | 62 InitializeOneOffInternal(); |
| 63 } | 63 } |
| 64 | 64 |
| 65 if (initialized) { | 65 if (initialized) { |
| 66 DVLOG(1) << "Using " | 66 DVLOG(1) << "Using " |
| 67 << GetGLImplementationName(GetGLImplementation()) | 67 << GetGLImplementationName(GetGLImplementation()) |
| 68 << " GL implementation."; | 68 << " GL implementation."; |
| 69 if (CommandLine::ForCurrentProcess()->HasSwitch( | |
| 70 switches::kEnableGPUServiceLogging)) | |
| 71 InitializeDebugGLBindings(); | |
| 72 } | 69 } |
| 73 return initialized; | 70 return initialized; |
| 74 } | 71 } |
| 75 | 72 |
| 76 GLSurface::GLSurface() {} | 73 GLSurface::GLSurface() {} |
| 77 | 74 |
| 78 bool GLSurface::Initialize() { | 75 bool GLSurface::Initialize() { |
| 79 return true; | 76 return true; |
| 80 } | 77 } |
| 81 | 78 |
| (...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 254 return surface_->GetFormat(); | 251 return surface_->GetFormat(); |
| 255 } | 252 } |
| 256 | 253 |
| 257 VSyncProvider* GLSurfaceAdapter::GetVSyncProvider() { | 254 VSyncProvider* GLSurfaceAdapter::GetVSyncProvider() { |
| 258 return surface_->GetVSyncProvider(); | 255 return surface_->GetVSyncProvider(); |
| 259 } | 256 } |
| 260 | 257 |
| 261 GLSurfaceAdapter::~GLSurfaceAdapter() {} | 258 GLSurfaceAdapter::~GLSurfaceAdapter() {} |
| 262 | 259 |
| 263 } // namespace gfx | 260 } // namespace gfx |
| OLD | NEW |