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 // This file implements the GLContextWGL and PbufferGLContext classes. | 5 // This file implements the GLContextWGL and PbufferGLContext classes. |
6 | 6 |
7 #include "ui/gl/gl_context_wgl.h" | 7 #include "ui/gl/gl_context_wgl.h" |
8 | 8 |
9 #include "base/debug/trace_event.h" | 9 #include "base/debug/trace_event.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
67 wglDeleteContext(context_); | 67 wglDeleteContext(context_); |
68 context_ = NULL; | 68 context_ = NULL; |
69 } | 69 } |
70 } | 70 } |
71 | 71 |
72 bool GLContextWGL::MakeCurrent(GLSurface* surface) { | 72 bool GLContextWGL::MakeCurrent(GLSurface* surface) { |
73 DCHECK(context_); | 73 DCHECK(context_); |
74 if (IsCurrent(surface)) | 74 if (IsCurrent(surface)) |
75 return true; | 75 return true; |
76 | 76 |
| 77 ScopedReleaseCurrent release_current; |
77 TRACE_EVENT0("gpu", "GLContextWGL::MakeCurrent"); | 78 TRACE_EVENT0("gpu", "GLContextWGL::MakeCurrent"); |
78 | 79 |
79 if (!wglMakeCurrent(static_cast<HDC>(surface->GetHandle()), context_)) { | 80 if (!wglMakeCurrent(static_cast<HDC>(surface->GetHandle()), context_)) { |
80 LOG(ERROR) << "Unable to make gl context current."; | 81 LOG(ERROR) << "Unable to make gl context current."; |
81 return false; | 82 return false; |
82 } | 83 } |
83 | 84 |
84 // Set this as soon as the context is current, since we might call into GL. | 85 // Set this as soon as the context is current, since we might call into GL. |
85 SetRealGLApi(); | 86 SetRealGLApi(); |
86 | 87 |
87 SetCurrent(surface); | 88 SetCurrent(surface); |
88 if (!InitializeDynamicBindings()) { | 89 if (!InitializeDynamicBindings()) { |
89 ReleaseCurrent(surface); | |
90 return false; | 90 return false; |
91 } | 91 } |
92 | 92 |
93 if (!surface->OnMakeCurrent(this)) { | 93 if (!surface->OnMakeCurrent(this)) { |
94 LOG(ERROR) << "Could not make current."; | 94 LOG(ERROR) << "Could not make current."; |
95 return false; | 95 return false; |
96 } | 96 } |
97 | 97 |
| 98 release_current.Cancel(); |
98 return true; | 99 return true; |
99 } | 100 } |
100 | 101 |
101 void GLContextWGL::ReleaseCurrent(GLSurface* surface) { | 102 void GLContextWGL::ReleaseCurrent(GLSurface* surface) { |
102 if (!IsCurrent(surface)) | 103 if (!IsCurrent(surface)) |
103 return; | 104 return; |
104 | 105 |
105 SetCurrent(NULL); | 106 SetCurrent(NULL); |
106 wglMakeCurrent(NULL, NULL); | 107 wglMakeCurrent(NULL, NULL); |
107 } | 108 } |
(...skipping 27 matching lines...) Expand all Loading... |
135 if (gfx::g_driver_wgl.ext.b_WGL_EXT_swap_control) { | 136 if (gfx::g_driver_wgl.ext.b_WGL_EXT_swap_control) { |
136 wglSwapIntervalEXT(interval); | 137 wglSwapIntervalEXT(interval); |
137 } else { | 138 } else { |
138 LOG(WARNING) << | 139 LOG(WARNING) << |
139 "Could not disable vsync: driver does not " | 140 "Could not disable vsync: driver does not " |
140 "support WGL_EXT_swap_control"; | 141 "support WGL_EXT_swap_control"; |
141 } | 142 } |
142 } | 143 } |
143 | 144 |
144 } // namespace gfx | 145 } // namespace gfx |
OLD | NEW |