diff options
| author | Andreas Gampe <agampe@google.com> | 2015-03-18 22:19:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-03-18 22:19:27 +0000 |
| commit | 9cc36ac2a2e07f81a9b11da7ff08e0da58b0143e (patch) | |
| tree | 88d5e3011e798c16ca7d1835a8a99938699daca9 /rs/java | |
| parent | 2a247b361089c0744202b604e22f9a79d239b92c (diff) | |
| parent | 16720c184946f3665dd034abaef2d648efdae627 (diff) | |
| download | frameworks_base-9cc36ac2a2e07f81a9b11da7ff08e0da58b0143e.zip frameworks_base-9cc36ac2a2e07f81a9b11da7ff08e0da58b0143e.tar.gz frameworks_base-9cc36ac2a2e07f81a9b11da7ff08e0da58b0143e.tar.bz2 | |
Merge "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); |