summaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authorJason Sams <rjsams@android.com>2010-09-22 14:27:50 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-09-22 14:27:50 -0700
commit353a48e8ed90c028fb51fe145dae6113661f03e4 (patch)
tree2e72575771b633e5d3ef7bd42718b245917ac22e /graphics
parente59c69dc3b1f2fa206aa22698c4aa31498438a5e (diff)
parent1bfccb45dfe53da00e0618e5af5062c1e37a6c18 (diff)
downloadframeworks_base-353a48e8ed90c028fb51fe145dae6113661f03e4.zip
frameworks_base-353a48e8ed90c028fb51fe145dae6113661f03e4.tar.gz
frameworks_base-353a48e8ed90c028fb51fe145dae6113661f03e4.tar.bz2
Merge "Fix two minor RS bugs. 1: index set size was populated with bad value in java, 2: bad error check in uploadToBufferObject."
Diffstat (limited to 'graphics')
-rw-r--r--graphics/java/android/renderscript/Mesh.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/graphics/java/android/renderscript/Mesh.java b/graphics/java/android/renderscript/Mesh.java
index b74c1f8..d36b2f1 100644
--- a/graphics/java/android/renderscript/Mesh.java
+++ b/graphics/java/android/renderscript/Mesh.java
@@ -69,7 +69,7 @@ public class Mesh extends BaseObj {
int[] primitives = new int[idxCount];
mRS.nMeshGetVertices(mID, vtxIDs, vtxCount);
- mRS.nMeshGetIndices(mID, idxIDs, primitives, vtxCount);
+ mRS.nMeshGetIndices(mID, idxIDs, primitives, idxCount);
mVertexBuffers = new Allocation[vtxCount];
mIndexBuffers = new Allocation[idxCount];