diff options
| author | Jason Sams <rjsams@android.com> | 2010-09-22 14:20:08 -0700 |
|---|---|---|
| committer | Jason Sams <rjsams@android.com> | 2010-09-22 14:20:08 -0700 |
| commit | 1bfccb45dfe53da00e0618e5af5062c1e37a6c18 (patch) | |
| tree | d4739a1f506ade5f7e2288f9b6514c9c7a08fcf7 | |
| parent | 7aa150c0967b725850cf27de58f50a25a960b092 (diff) | |
| download | frameworks_base-1bfccb45dfe53da00e0618e5af5062c1e37a6c18.zip frameworks_base-1bfccb45dfe53da00e0618e5af5062c1e37a6c18.tar.gz frameworks_base-1bfccb45dfe53da00e0618e5af5062c1e37a6c18.tar.bz2 | |
Fix two minor RS bugs.
1: index set size was populated with bad value in java,
2: bad error check in uploadToBufferObject.
Change-Id: I5946053cdfba0b2fbbaa34d562a9ec53e26ce9f2
| -rw-r--r-- | graphics/java/android/renderscript/Mesh.java | 2 | ||||
| -rw-r--r-- | libs/rs/rsMesh.cpp | 2 |
2 files changed, 1 insertions, 3 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]; diff --git a/libs/rs/rsMesh.cpp b/libs/rs/rsMesh.cpp index 810e4ff..8e43f24 100644 --- a/libs/rs/rsMesh.cpp +++ b/libs/rs/rsMesh.cpp @@ -124,8 +124,6 @@ void Mesh::uploadAll(Context *rsc) mPrimitives[ct]->mIndexBuffer->deferedUploadToBufferObject(rsc); } } - - rsc->checkError("Mesh::uploadAll"); } void Mesh::updateGLPrimitives() |