diff options
| author | 2009-12-23 14:35:29 -0800 | |
|---|---|---|
| committer | 2009-12-23 14:35:29 -0800 | |
| commit | 718cd1f322ee5b62b6a49cb36195bcb18a5ab711 (patch) | |
| tree | f2f8c9db5a8141eafa2f1547634d7586fdc6ef04 /libs/rs/rsSimpleMesh.cpp | |
| parent | ceedafacdb87307234c84196a12eeb6e657d6220 (diff) | |
Element restructuring. Add support for new basic Element types including the RS objects and vectors(2-4). In theory this paves the way for maintaining type info for RS objects, passing elements for GLSL uiforms/attribs/varyings, and supporting nested structures.
This will break some apps, checkings for other projects will follow to unbreak them.
Diffstat (limited to 'libs/rs/rsSimpleMesh.cpp')
| -rw-r--r-- | libs/rs/rsSimpleMesh.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libs/rs/rsSimpleMesh.cpp b/libs/rs/rsSimpleMesh.cpp index f7d14a545993..5f5622d52fd5 100644 --- a/libs/rs/rsSimpleMesh.cpp +++ b/libs/rs/rsSimpleMesh.cpp @@ -62,9 +62,9 @@ void SimpleMesh::renderRange(Context *rsc, uint32_t start, uint32_t len) const mVertexTypes[ct]->enableGLVertexBuffer(&va); } if (rsc->checkVersion2_0()) { - va.setupGL2(0, &rsc->mShaderCache); + va.setupGL2(rsc, 0, &rsc->mShaderCache); } else { - va.setupGL(0); + va.setupGL(rsc, 0); } if (mIndexType.get()) { @@ -74,6 +74,8 @@ void SimpleMesh::renderRange(Context *rsc, uint32_t start, uint32_t len) const } else { glDrawArrays(mGLPrimitive, start, len); } + + rsc->checkError("SimpleMesh::renderRange"); } void SimpleMesh::uploadAll(Context *rsc) @@ -89,6 +91,7 @@ void SimpleMesh::uploadAll(Context *rsc) if (mPrimitiveBuffer.get()) { mPrimitiveBuffer->deferedUploadToBufferObject(rsc); } + rsc->checkError("SimpleMesh::uploadAll"); } |