Merge "Release the scratch pbuffer surface after use"

critsec · Android (Google) Code Review · commit 3da2dc9d4cc4 · 2012-04-09T22:41:04.000-07:00
diff --git a/core/java/android/view/HardwareRenderer.java b/core/java/android/view/HardwareRenderer.java
@@ -1394,6 +1394,11 @@ void destroyHardwareResources(View view) {
 
                 destroyResources(view);
                 GLES20Canvas.flushCaches(GLES20Canvas.FLUSH_CACHES_LAYERS);
+
+                if (needsContext) {
+                    sEgl.eglMakeCurrent(sEglDisplay, EGL_NO_SURFACE,
+                            EGL_NO_SURFACE, EGL_NO_CONTEXT);
+                }
             }
         }
 
@@ -1434,6 +1439,9 @@ static void trimMemory(int level) {
             } else if (level >= ComponentCallbacks2.TRIM_MEMORY_UI_HIDDEN) {
                 GLES20Canvas.flushCaches(GLES20Canvas.FLUSH_CACHES_MODERATE);
             }
+
+            sEgl.eglMakeCurrent(sEglDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE,
+                    EGL_NO_CONTEXT);
         }
 
         private static void usePbufferSurface(EGLContext eglContext) {

Original file line number	Diff line number	Diff line change
`@@ -1394,6 +1394,11 @@ void destroyHardwareResources(View view) {`
`1394`	`1394`
`1395`	`1395`	`destroyResources(view);`
`1396`	`1396`	`GLES20Canvas.flushCaches(GLES20Canvas.FLUSH_CACHES_LAYERS);`
	`1397`	`+`
	`1398`	`+ if (needsContext) {`
	`1399`	`+ sEgl.eglMakeCurrent(sEglDisplay, EGL_NO_SURFACE,`
	`1400`	`+ EGL_NO_SURFACE, EGL_NO_CONTEXT);`
	`1401`	`+ }`
`1397`	`1402`	`}`
`1398`	`1403`	`}`
`1399`	`1404`
`@@ -1434,6 +1439,9 @@ static void trimMemory(int level) {`
`1434`	`1439`	`} else if (level >= ComponentCallbacks2.TRIM_MEMORY_UI_HIDDEN) {`
`1435`	`1440`	`GLES20Canvas.flushCaches(GLES20Canvas.FLUSH_CACHES_MODERATE);`
`1436`	`1441`	`}`
	`1442`	`+`
	`1443`	`+ sEgl.eglMakeCurrent(sEglDisplay, EGL_NO_SURFACE, EGL_NO_SURFACE,`
	`1444`	`+ EGL_NO_CONTEXT);`
`1437`	`1445`	`}`
`1438`	`1446`
`1439`	`1447`	`private static void usePbufferSurface(EGLContext eglContext) {`