From 1bfccb45dfe53da00e0618e5af5062c1e37a6c18 Mon Sep 17 00:00:00 2001 From: Jason Sams Date: Wed, 22 Sep 2010 14:20:08 -0700 Subject: [PATCH] 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 --- graphics/java/android/renderscript/Mesh.java | 2 +- libs/rs/rsMesh.cpp | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/graphics/java/android/renderscript/Mesh.java b/graphics/java/android/renderscript/Mesh.java index b74c1f82409a4..d36b2f1657afb 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 810e4ff95738e..8e43f2425cfbd 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()