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

Unified Diff: ui/gl/gl_surface_egl.cc

Issue 712343003: Infrastructure for temportarily relinquishing GPU resources. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month 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
« content/common/gpu/gpu_channel_manager.cc ('K') | « ui/gl/gl_surface_egl.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl_surface_egl.cc
diff --git a/ui/gl/gl_surface_egl.cc b/ui/gl/gl_surface_egl.cc
index c34ca0e70e7a25396a82cd9310a90c2ef0630cd6..db734a55ce33ff8bc2a2504a8a4daa958123b531 100644
--- a/ui/gl/gl_surface_egl.cc
+++ b/ui/gl/gl_surface_egl.cc
@@ -62,6 +62,14 @@ EGLConfig g_config;
EGLDisplay g_display;
EGLNativeDisplayType g_native_display;
+// In the Cast environment, we need to destroy the displayType
+// returned by the GPU platform when we switch to an external app
+// which will temporarily own all screen and GPU resources.
+// Even though Chromium is still in the background.
+// As such, it must be reinitialized each time we come back to the foreground.
+bool g_initialized = false;
+int g_num_surfaces = 0;
+
const char* g_egl_extensions = NULL;
bool g_egl_create_context_robustness_supported = false;
bool g_egl_sync_control_supported = false;
@@ -109,8 +117,7 @@ class EGLSyncControlVSyncProvider
GLSurfaceEGL::GLSurfaceEGL() {}
bool GLSurfaceEGL::InitializeOneOff() {
- static bool initialized = false;
- if (initialized)
+ if (g_initialized)
return true;
g_native_display = GetPlatformDefaultEGLNativeDisplay();
@@ -186,6 +193,11 @@ bool GLSurfaceEGL::InitializeOneOff() {
g_egl_window_fixed_size_supported =
HasEGLExtension("EGL_ANGLE_window_fixed_size");
+ // We always succeed beyond this point so set g_initialized here to avoid
+ // infinite recursion through CreateGLContext and GetDisplay
+ // if g_egl_surfaceless_context_supported.
+ g_initialized = true;
+
// TODO(oetuaho@nvidia.com): Surfaceless is disabled on Android as a temporary
// workaround, since code written for Android WebView takes different paths
// based on whether GL surface objects have underlying EGL surface handles,
@@ -215,24 +227,41 @@ bool GLSurfaceEGL::InitializeOneOff() {
}
#endif
- initialized = true;
-
return true;
}
+// static
+void GLSurfaceEGL::Deinitialize() {
+ g_initialized = false;
+}
+
EGLDisplay GLSurfaceEGL::GetDisplay() {
+ if (!g_initialized) {
+ bool result = GLSurfaceEGL::InitializeOneOff();
+ DCHECK(result);
+ }
return g_display;
}
EGLDisplay GLSurfaceEGL::GetHardwareDisplay() {
+ if (!g_initialized) {
+ bool result = GLSurfaceEGL::InitializeOneOff();
+ DCHECK(result);
+ }
return g_display;
}
EGLNativeDisplayType GLSurfaceEGL::GetNativeDisplay() {
+ if (!g_initialized) {
+ bool result = GLSurfaceEGL::InitializeOneOff();
+ DCHECK(result);
+ }
return g_native_display;
}
const char* GLSurfaceEGL::GetEGLExtensions() {
+ // No need for InitializeOneOff. Assume that extensions will not change
+ // after the first initialization.
return g_egl_extensions;
}
@@ -355,6 +384,7 @@ bool NativeViewGLSurfaceEGL::Initialize(
vsync_provider_.reset(sync_provider.release());
else if (g_egl_sync_control_supported)
vsync_provider_.reset(new EGLSyncControlVSyncProvider(surface_));
+ ++g_num_surfaces;
return true;
}
@@ -365,6 +395,10 @@ void NativeViewGLSurfaceEGL::Destroy() {
<< GetLastEGLErrorString();
}
surface_ = NULL;
+ CHECK(g_num_surfaces > 0) << "Bad surface count";
jbauman 2014/11/12 01:47:28 DCHECK probably makes more sense here.
GusFernandez 2014/11/15 02:11:56 Done.
+ if (--g_num_surfaces == 0) {
+ GLSurfaceEGL::Deinitialize();
+ }
}
}
@@ -608,8 +642,11 @@ bool PbufferGLSurfaceEGL::Initialize() {
return false;
}
- if (old_surface)
+ if (old_surface) {
eglDestroySurface(display, old_surface);
+ } else {
+ ++g_num_surfaces;
+ }
surface_ = new_surface;
return true;
@@ -621,6 +658,10 @@ void PbufferGLSurfaceEGL::Destroy() {
LOG(ERROR) << "eglDestroySurface failed with error "
<< GetLastEGLErrorString();
}
+ CHECK(g_num_surfaces > 0) << "Bad surface count";
+ if (--g_num_surfaces == 0) {
+ GLSurfaceEGL::Deinitialize();
+ }
surface_ = NULL;
}
}
« content/common/gpu/gpu_channel_manager.cc ('K') | « ui/gl/gl_surface_egl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698