diff options
| author | Andreas Gampe <agampe@google.com> | 2015-03-18 23:50:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-18 23:50:47 +0000 |
| commit | e09a94158586abdda98d6770fc62c2653a29a41c (patch) | |
| tree | 991718194bc69186256e546de9fb24d5460a3066 /rs/java | |
| parent | 870c4ba78a8a272cade87e98e0105eb850db0fec (diff) | |
| parent | 4f0a96d2d923bd1f4c7f46ec25c83711565b77db (diff) | |
| download | frameworks_base-e09a94158586abdda98d6770fc62c2653a29a41c.zip frameworks_base-e09a94158586abdda98d6770fc62c2653a29a41c.tar.gz frameworks_base-e09a94158586abdda98d6770fc62c2653a29a41c.tar.bz2 | |
am 4f0a96d2: am 9cc36ac2: Merge "Frameworks/base: Remove duplicate check in Mesh"
* commit '4f0a96d2d923bd1f4c7f46ec25c83711565b77db':
Frameworks/base: Remove duplicate check in Mesh
Diffstat (limited to 'rs/java')
| -rw-r--r-- | rs/java/android/renderscript/Mesh.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/rs/java/android/renderscript/Mesh.java b/rs/java/android/renderscript/Mesh.java index 1a5dc9e..5b4cadb 100644 --- a/rs/java/android/renderscript/Mesh.java +++ b/rs/java/android/renderscript/Mesh.java @@ -811,9 +811,7 @@ public class Mesh extends BaseObj { sm.getVertexAllocation(0).copy1DRangeFromUnchecked(0, mMaxIndex, mVtxData); if(uploadToBufferObject) { - if (uploadToBufferObject) { - sm.getVertexAllocation(0).syncAll(Allocation.USAGE_SCRIPT); - } + sm.getVertexAllocation(0).syncAll(Allocation.USAGE_SCRIPT); } sm.getIndexSetAllocation(0).copy1DRangeFromUnchecked(0, mIndexCount, mIndexData); |