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

Unified Diff: content/common/gpu/media/rendering_helper.cc

Issue 339863002: rendering_helper: Release GL context before terminate a display. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/gpu/media/rendering_helper.cc
diff --git a/content/common/gpu/media/rendering_helper.cc b/content/common/gpu/media/rendering_helper.cc
index 6abe8c5ca4dda93ac3032d70dee4deae488a1872..52ef543825576ee32b36e7449ac26ef120583181 100644
--- a/content/common/gpu/media/rendering_helper.cc
+++ b/content/common/gpu/media/rendering_helper.cc
@@ -157,7 +157,7 @@ void RenderingHelper::Initialize(const RenderingHelperParams& params,
#endif
gl_display_ = eglGetDisplay(native_display);
CHECK(gl_display_);
- CHECK(eglInitialize(gl_display_, NULL, NULL)) << glGetError();
+ CHECK(eglInitialize(gl_display_, NULL, NULL)) << eglGetError();
static EGLint rgba8888[] = {
EGL_RED_SIZE, 8,
@@ -398,6 +398,9 @@ void RenderingHelper::UnInitialize(base::WaitableEvent* done) {
glXDestroyContext(x_display_, gl_context_);
#else // EGL
+ CHECK(eglMakeCurrent(
Pawel Osciak 2014/06/19 03:59:23 Don't we need to glxMakeCurrent for GLX above as w
Owen Lin 2014/06/19 05:21:33 No, it only needed for EGL. https://chromiumcoder
+ gl_display_, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT))
+ << eglGetError();
CHECK(eglDestroyContext(gl_display_, gl_context_));
CHECK(eglDestroySurface(gl_display_, gl_surface_));
CHECK(eglTerminate(gl_display_));
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698