summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Sams <jsams@google.com>2015-03-18 19:44:36 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-03-18 19:44:37 +0000
commit1aadd3474177e6946ea0aae03f0628e436d0cf87 (patch)
tree9633423e39408a99ab35e7cb3c41110e6d62ff58
parent28e6aeca3aad075ef4fd7aab08cd1ad1ff9eb555 (diff)
parent1e68bac5f80b64beceaa60e6c2d560ab26c8d72d (diff)
downloadframeworks_base-1aadd3474177e6946ea0aae03f0628e436d0cf87.zip
frameworks_base-1aadd3474177e6946ea0aae03f0628e436d0cf87.tar.gz
frameworks_base-1aadd3474177e6946ea0aae03f0628e436d0cf87.tar.bz2
Merge "Avoid duplicate surface creation."
-rw-r--r--rs/java/android/renderscript/Allocation.java9
1 files changed, 8 insertions, 1 deletions
diff --git a/rs/java/android/renderscript/Allocation.java b/rs/java/android/renderscript/Allocation.java
index c6afa2c..523c8fb 100644
--- a/rs/java/android/renderscript/Allocation.java
+++ b/rs/java/android/renderscript/Allocation.java
@@ -76,6 +76,8 @@ public class Allocation extends BaseObj {
new HashMap<Long, Allocation>();
OnBufferAvailableListener mBufferNotifier;
+ private Surface mGetSurfaceSurface = null;
+
private Element.DataType validateObjectIsPrimitiveArray(Object d, boolean checkType) {
final Class c = d.getClass();
if (!c.isArray()) {
@@ -1990,7 +1992,12 @@ public class Allocation extends BaseObj {
if ((mUsage & USAGE_IO_INPUT) == 0) {
throw new RSInvalidStateException("Allocation is not a surface texture.");
}
- return mRS.nAllocationGetSurface(getID(mRS));
+
+ if (mGetSurfaceSurface == null) {
+ mGetSurfaceSurface = mRS.nAllocationGetSurface(getID(mRS));
+ }
+
+ return mGetSurfaceSurface;
}
/**