Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 353a48e8 authored by Jason Sams's avatar Jason Sams Committed by Android (Google) Code Review
Browse files

Merge "Fix two minor RS bugs. 1: index set size was populated with bad value... 

Merge "Fix two minor RS bugs. 1: index set size was populated with bad value in java, 2: bad error check in uploadToBufferObject."
parents e59c69dc 1bfccb45

graphics/java/android/renderscript/Mesh.java

+1 −1
Original line number Diff line number Diff line
@@ -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];

libs/rs/rsMesh.cpp

+0 −2
Original line number Diff line number Diff line
@@ -124,8 +124,6 @@ void Mesh::uploadAll(Context *rsc) 
            mPrimitives[ct]->mIndexBuffer->deferedUploadToBufferObject(rsc);

        }

    }



    rsc->checkError("Mesh::uploadAll");

}



void Mesh::updateGLPrimitives()