commit 80429c458506485904715180d10584092a5cd082
author Romain Guy <romainguy@google.com> Fri Jun 24 17:20:32 2011 -0700
committer Romain Guy <romainguy@google.com> Fri Jun 24 17:20:32 2011 -0700
tree 7a7daee4889e2f9dd679a98b12e38ccb2dbed743
parent 58f4edb7701bf20925468fa5fd1a06a461ff085b

Properly tear down TextureView

Change-Id: Ic23cd9257889d0abe8cc3fc1d04a66d0505e383e

core/java/android/view/TextureView.java

diff --git a/core/java/android/view/TextureView.java b/core/java/android/view/TextureView.java
index 0c0cd76..d656f31 100644
--- a/core/java/android/view/TextureView.java
+++ b/core/java/android/view/TextureView.java
@@ -185,7 +185,7 @@
     protected void onDetachedFromWindow() {
         super.onDetachedFromWindow();
 
-        if (isHardwareAccelerated() && mLayer != null) {
+        if (mLayer != null) {
             if (mListener != null) {
                 mListener.onSurfaceTextureDestroyed(mSurface);
             }

libs/hwui/LayerRenderer.cpp

diff --git a/libs/hwui/LayerRenderer.cpp b/libs/hwui/LayerRenderer.cpp
index dfb5d3b..b9ef33a 100644
--- a/libs/hwui/LayerRenderer.cpp
+++ b/libs/hwui/LayerRenderer.cpp
@@ -281,6 +281,7 @@
         layer->texTransform.load(transform);
         layer->renderTarget = renderTarget;
 
+        // TODO: This should be done only when the render target has changed
         glBindTexture(layer->renderTarget, layer->texture);
 
         glTexParameteri(layer->renderTarget, GL_TEXTURE_MIN_FILTER, GL_LINEAR);

tests/HwAccelerationTest/src/com/android/test/hwui/GLTextureViewActivity.java

diff --git a/tests/HwAccelerationTest/src/com/android/test/hwui/GLTextureViewActivity.java b/tests/HwAccelerationTest/src/com/android/test/hwui/GLTextureViewActivity.java
index 723f3e8..1dfeb4e 100644
--- a/tests/HwAccelerationTest/src/com/android/test/hwui/GLTextureViewActivity.java
+++ b/tests/HwAccelerationTest/src/com/android/test/hwui/GLTextureViewActivity.java
@@ -93,8 +93,6 @@
         private static final String LOG_TAG = "GLTextureView";
 
         static final int EGL_CONTEXT_CLIENT_VERSION = 0x3098;
-        static final int EGL_SURFACE_TYPE = 0x3033;
-        static final int EGL_SWAP_BEHAVIOR_PRESERVED_BIT = 0x0400;
         static final int EGL_OPENGL_ES2_BIT = 4;
 
         private volatile boolean mFinished;

tests/HwAccelerationTest/src/com/android/test/hwui/TextureViewActivity.java

diff --git a/tests/HwAccelerationTest/src/com/android/test/hwui/TextureViewActivity.java b/tests/HwAccelerationTest/src/com/android/test/hwui/TextureViewActivity.java
index 01ee90a..19ee5c7 100644
--- a/tests/HwAccelerationTest/src/com/android/test/hwui/TextureViewActivity.java
+++ b/tests/HwAccelerationTest/src/com/android/test/hwui/TextureViewActivity.java
@@ -25,6 +25,7 @@
 import android.view.Gravity;
 import android.view.TextureView;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.FrameLayout;