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

Unified Diff: ui/gl/gl_context_wgl.cc

Issue 221433004: gpu: Bind dummy GL API when no context is current (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix two gpu unittests Created 6 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/gl/gl_context_osmesa.cc ('k') | ui/gl/gl_gl_api_implementation.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl_context_wgl.cc
diff --git a/ui/gl/gl_context_wgl.cc b/ui/gl/gl_context_wgl.cc
index 41f1b6349e027c24fedf7a190db21e0b2bda93db..abe47e4f9f7a78be1c32d3c02689e191314ce344 100644
--- a/ui/gl/gl_context_wgl.cc
+++ b/ui/gl/gl_context_wgl.cc
@@ -74,6 +74,7 @@ bool GLContextWGL::MakeCurrent(GLSurface* surface) {
if (IsCurrent(surface))
return true;
+ ScopedReleaseCurrent release_current;
TRACE_EVENT0("gpu", "GLContextWGL::MakeCurrent");
if (!wglMakeCurrent(static_cast<HDC>(surface->GetHandle()), context_)) {
@@ -86,7 +87,6 @@ bool GLContextWGL::MakeCurrent(GLSurface* surface) {
SetCurrent(surface);
if (!InitializeDynamicBindings()) {
- ReleaseCurrent(surface);
return false;
}
@@ -95,6 +95,7 @@ bool GLContextWGL::MakeCurrent(GLSurface* surface) {
return false;
}
+ release_current.Cancel();
return true;
}
« no previous file with comments | « ui/gl/gl_context_osmesa.cc ('k') | ui/gl/gl_gl_api_implementation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698