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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/gl/gl_context_egl.cc

Issue 10636006: Use glFinish() before EGL context switch for ARM (Closed) Base URL: https://git.chromium.org/git/chromium/src@master
Patch Set: Comment fix, also commit message Created 8 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: ui/gl/gl_context_egl.cc
diff --git a/ui/gl/gl_context_egl.cc b/ui/gl/gl_context_egl.cc
index f77c9f9d5eceae26aa917cf340a79621cba7e2cc..e3e18ff879b2b0e72b596b7a868b61ef5c60205f 100644
--- a/ui/gl/gl_context_egl.cc
+++ b/ui/gl/gl_context_egl.cc
@@ -75,7 +75,16 @@ bool GLContextEGL::MakeCurrent(GLSurface* surface) {
if (IsCurrent(surface))
return true;
- TRACE_EVENT0("gpu", "GLContextEGL::MakeCurrent");
+ TRACE_EVENT2("gpu", "GLContextEGL::MakeCurrent",
+ "context", context_,
+ "surface", surface);
+
+ // Mali work-around: glFlush() does not synchronize between contexts
+ // chrome-os-partner:10068
+#if defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL)
+ if (eglGetCurrentContext() != NULL)
+ glFinish();
+#endif // defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL)
if (!eglMakeCurrent(display_,
surface->GetHandle(),
« 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