Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Destroy Type created by Allocation.createSized()"

Browse Source
This commit is contained in:
Yang Ni
2016-04-12 22:07:56 +00:00
committed by Gerrit Code Review
parent 01db88335d 3444dbe025
commit 2a64e23857
1 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
rs/java/android/renderscript/Allocation.java
View File

@@ -58,6 +58,7 @@ public class Allocation extends BaseObj {
private static final int MAX_NUMBER_IO_INPUT_ALLOC = 16; private static final int MAX_NUMBER_IO_INPUT_ALLOC = 16;
Type mType; Type mType;
boolean mOwningType = false;
Bitmap mBitmap; Bitmap mBitmap;
int mUsage; int mUsage;
Allocation mAdaptedAllocation; Allocation mAdaptedAllocation;
@@ -383,13 +384,16 @@ public class Allocation extends BaseObj {
guard.open("destroy"); guard.open("destroy");
} }
Allocation(long id, RenderScript rs, Type t, int usage, MipmapControl mips) { Allocation(long id, RenderScript rs, Type t, boolean owningType, int usage, MipmapControl mips) {
this(id, rs, t, usage); this(id, rs, t, usage);
mOwningType = owningType;
mMipmapControl = mips; mMipmapControl = mips;
} }
protected void finalize() throws Throwable { protected void finalize() throws Throwable {
RenderScript.registerNativeFree.invoke(RenderScript.sRuntime, mSize); RenderScript.registerNativeFree.invoke(RenderScript.sRuntime, mSize);
// Set mType null to avoid double-destroying it in case its finalizer races ahead
mType = null;
super.finalize(); super.finalize();
} }
@@ -1578,6 +1582,9 @@ public class Allocation extends BaseObj {
mRS.finish(); // Necessary because resize is fifoed and update is async. mRS.finish(); // Necessary because resize is fifoed and update is async.
long typeID = mRS.nAllocationGetType(getID(mRS)); long typeID = mRS.nAllocationGetType(getID(mRS));
// Sets zero the mID so that the finalizer of the old mType value won't
// destroy the native object that is being reused.
mType.setID(0);
mType = new Type(typeID, mRS); mType = new Type(typeID, mRS);
mType.updateFromNative(); mType.updateFromNative();
updateCacheInfo(mType); updateCacheInfo(mType);
@@ -1921,7 +1928,7 @@ public class Allocation extends BaseObj {
if (id == 0) { if (id == 0) {
throw new RSRuntimeException("Allocation creation failed."); throw new RSRuntimeException("Allocation creation failed.");
} }
return new Allocation(id, rs, type, usage, mips); return new Allocation(id, rs, type, false, usage, mips);
} finally { } finally {
Trace.traceEnd(RenderScript.TRACE_TAG); Trace.traceEnd(RenderScript.TRACE_TAG);
} }
@@ -1979,7 +1986,7 @@ public class Allocation extends BaseObj {
if (id == 0) { if (id == 0) {
throw new RSRuntimeException("Allocation creation failed."); throw new RSRuntimeException("Allocation creation failed.");
} }
return new Allocation(id, rs, t, usage, MipmapControl.MIPMAP_NONE); return new Allocation(id, rs, t, true, usage, MipmapControl.MIPMAP_NONE);
} finally { } finally {
Trace.traceEnd(RenderScript.TRACE_TAG); Trace.traceEnd(RenderScript.TRACE_TAG);
} }
@@ -2068,7 +2075,7 @@ public class Allocation extends BaseObj {
} }
// keep a reference to the Bitmap around to prevent GC // keep a reference to the Bitmap around to prevent GC
Allocation alloc = new Allocation(id, rs, t, usage, mips); Allocation alloc = new Allocation(id, rs, t, true, usage, mips);
alloc.setBitmap(b); alloc.setBitmap(b);
return alloc; return alloc;
} }
@@ -2078,7 +2085,7 @@ public class Allocation extends BaseObj {
if (id == 0) { if (id == 0) {
throw new RSRuntimeException("Load failed."); throw new RSRuntimeException("Load failed.");
} }
return new Allocation(id, rs, t, usage, mips); return new Allocation(id, rs, t, true, usage, mips);
} finally { } finally {
Trace.traceEnd(RenderScript.TRACE_TAG); Trace.traceEnd(RenderScript.TRACE_TAG);
} }
@@ -2152,7 +2159,7 @@ public class Allocation extends BaseObj {
} }
for (int i=1; i<numAlloc; i++) { for (int i=1; i<numAlloc; i++) {
mAllocationArray[i] = createFromAllcation(rs, mAllocationArray[0]); mAllocationArray[i] = createFromAllocation(rs, mAllocationArray[0]);
} }
return mAllocationArray; return mAllocationArray;
} finally { } finally {
@@ -2171,7 +2178,7 @@ public class Allocation extends BaseObj {
* @param alloc RenderScript Allocation describing data layout. * @param alloc RenderScript Allocation describing data layout.
* @return Allocation sharing the same data structure. * @return Allocation sharing the same data structure.
*/ */
static Allocation createFromAllcation(RenderScript rs, Allocation alloc) { static Allocation createFromAllocation(RenderScript rs, Allocation alloc) {
try { try {
Trace.traceBegin(RenderScript.TRACE_TAG, "createFromAllcation"); Trace.traceBegin(RenderScript.TRACE_TAG, "createFromAllcation");
rs.validate(); rs.validate();
@@ -2186,7 +2193,7 @@ public class Allocation extends BaseObj {
if (id == 0) { if (id == 0) {
throw new RSRuntimeException("Allocation creation failed."); throw new RSRuntimeException("Allocation creation failed.");
} }
Allocation outAlloc = new Allocation(id, rs, type, usage, mips); Allocation outAlloc = new Allocation(id, rs, type, false, usage, mips);
if ((usage & USAGE_IO_INPUT) != 0) { if ((usage & USAGE_IO_INPUT) != 0) {
outAlloc.shareBufferQueue(alloc); outAlloc.shareBufferQueue(alloc);
} }
@@ -2364,7 +2371,7 @@ public class Allocation extends BaseObj {
if(id == 0) { if(id == 0) {
throw new RSRuntimeException("Load failed for bitmap " + b + " element " + e); throw new RSRuntimeException("Load failed for bitmap " + b + " element " + e);
} }
return new Allocation(id, rs, t, usage, mips); return new Allocation(id, rs, t, true, usage, mips);
} }
/** /**
@@ -2609,6 +2616,13 @@ public class Allocation extends BaseObj {
if((mUsage & USAGE_IO_OUTPUT) != 0) { if((mUsage & USAGE_IO_OUTPUT) != 0) {
setSurface(null); setSurface(null);
} }
if (mType != null && mOwningType) {
mType.destroy();
mType = null;
}
super.destroy(); super.destroy();
} }
} }