drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix potential npe"

Browse Source
This commit is contained in:
Jason Sams
2015-03-26 22:10:46 +00:00
committed by Gerrit Code Review
parent 727cac07cc ae5be38ebb
commit 22580b83f1
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rs/java/android/renderscript/Mesh.java
View File

@ -363,6 +363,9 @@ public class Mesh extends BaseObj {
alloc = Allocation.createTyped(mRS, entry.t, mUsage); alloc = Allocation.createTyped(mRS, entry.t, mUsage);
} else if(entry.e != null) { } else if(entry.e != null) {
alloc = Allocation.createSized(mRS, entry.e, entry.size, mUsage); alloc = Allocation.createSized(mRS, entry.e, entry.size, mUsage);
} else {
// Should never happen because the builder will always set one
throw new IllegalStateException("Builder corrupt, no valid element in entry.");
} }
vertexBuffers[ct] = alloc; vertexBuffers[ct] = alloc;
vtx[ct] = alloc.getID(mRS); vtx[ct] = alloc.getID(mRS);
@ -375,6 +378,9 @@ public class Mesh extends BaseObj {
alloc = Allocation.createTyped(mRS, entry.t, mUsage); alloc = Allocation.createTyped(mRS, entry.t, mUsage);
} else if(entry.e != null) { } else if(entry.e != null) {
alloc = Allocation.createSized(mRS, entry.e, entry.size, mUsage); alloc = Allocation.createSized(mRS, entry.e, entry.size, mUsage);
} else {
// Should never happen because the builder will always set one
throw new IllegalStateException("Builder corrupt, no valid element in entry.");
} }
long allocID = (alloc == null) ? 0 : alloc.getID(mRS); long allocID = (alloc == null) ? 0 : alloc.getID(mRS);
indexBuffers[ct] = alloc; indexBuffers[ct] = alloc;