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

Side by Side Diff: ui/gl/gl_context_cgl.cc

Issue 16894002: Unset GL Api when releasing a context. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
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 "ui/gl/gl_context_cgl.h" 5 #include "ui/gl/gl_context_cgl.h"
6 6
7 #include <OpenGL/CGLRenderers.h> 7 #include <OpenGL/CGLRenderers.h>
8 #include <OpenGL/CGLTypes.h> 8 #include <OpenGL/CGLTypes.h>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 SetRealGLApi(); 190 SetRealGLApi();
191 191
192 SetCurrent(surface); 192 SetCurrent(surface);
193 if (!InitializeExtensionBindings()) { 193 if (!InitializeExtensionBindings()) {
194 ReleaseCurrent(surface); 194 ReleaseCurrent(surface);
195 return false; 195 return false;
196 } 196 }
197 197
198 if (!surface->OnMakeCurrent(this)) { 198 if (!surface->OnMakeCurrent(this)) {
199 LOG(ERROR) << "Unable to make gl context current."; 199 LOG(ERROR) << "Unable to make gl context current.";
200 ReleaseCurrent(surface);
200 return false; 201 return false;
201 } 202 }
202 203
203 return true; 204 return true;
204 } 205 }
205 206
206 void GLContextCGL::ReleaseCurrent(GLSurface* surface) { 207 void GLContextCGL::ReleaseCurrent(GLSurface* surface) {
207 if (!IsCurrent(surface)) 208 if (!IsCurrent(surface))
208 return; 209 return;
209 210
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 296
296 GLContextCGL::~GLContextCGL() { 297 GLContextCGL::~GLContextCGL() {
297 Destroy(); 298 Destroy();
298 } 299 }
299 300
300 GpuPreference GLContextCGL::GetGpuPreference() { 301 GpuPreference GLContextCGL::GetGpuPreference() {
301 return gpu_preference_; 302 return gpu_preference_;
302 } 303 }
303 304
304 } // namespace gfx 305 } // namespace gfx
OLDNEW
« ui/gl/gl_bindings.h ('K') | « ui/gl/gl_context.cc ('k') | ui/gl/gl_context_egl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698