diff options
| author | Alex Sakhartchouk <alexst@google.com> | 2011-05-12 10:15:17 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-05-12 10:15:17 -0700 |
| commit | 415c842aa6dd3cc797ed2ef1ae42351f594a6c74 (patch) | |
| tree | 938ce71744d87aa03730d7fce22ca0243a369fa9 /libs/rs/driver/rsdVertexArray.cpp | |
| parent | e4ba346f0f1bb153ec1f9da5c0a4fc96c301efda (diff) | |
| parent | 407cae950325682a56fe5373dd218a666da901ef (diff) | |
| download | frameworks_base-415c842aa6dd3cc797ed2ef1ae42351f594a6c74.zip frameworks_base-415c842aa6dd3cc797ed2ef1ae42351f594a6c74.tar.gz frameworks_base-415c842aa6dd3cc797ed2ef1ae42351f594a6c74.tar.bz2 | |
Merge "rsLib cleanup"
Diffstat (limited to 'libs/rs/driver/rsdVertexArray.cpp')
| -rw-r--r-- | libs/rs/driver/rsdVertexArray.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libs/rs/driver/rsdVertexArray.cpp b/libs/rs/driver/rsdVertexArray.cpp index d0a5a54..62ec107 100644 --- a/libs/rs/driver/rsdVertexArray.cpp +++ b/libs/rs/driver/rsdVertexArray.cpp @@ -20,6 +20,7 @@ #include <GLES/gl.h> #include <GLES2/gl2.h> +#include "rsdGL.h" #include "rsdCore.h" #include "rsdVertexArray.h" #include "rsdShaderCache.h" @@ -78,13 +79,13 @@ void RsdVertexArray::logAttrib(uint32_t idx, uint32_t slot) const { mAttribs[idx].offset); } -void RsdVertexArray::setupGL2(const Context *rsc) const { +void RsdVertexArray::setup(const Context *rsc) const { RsdHal *dc = (RsdHal *)rsc->mHal.drv; RsdVertexArrayState *state = dc->gl.vertexArrayState; RsdShaderCache *sc = dc->gl.shaderCache; - rsc->checkError("RsdVertexArray::setupGL2 start"); + rsdGLCheckError(rsc, "RsdVertexArray::setup start"); uint32_t maxAttrs = state->mAttrsEnabledSize; for (uint32_t ct=1; ct < maxAttrs; ct++) { @@ -94,7 +95,7 @@ void RsdVertexArray::setupGL2(const Context *rsc) const { } } - rsc->checkError("RsdVertexArray::setupGL2 disabled"); + rsdGLCheckError(rsc, "RsdVertexArray::setup disabled"); for (uint32_t ct=0; ct < mCount; ct++) { int32_t slot = sc->vtxAttribSlot(mAttribs[ct].name); if (rsc->props.mLogShadersAttr) { @@ -113,7 +114,7 @@ void RsdVertexArray::setupGL2(const Context *rsc) const { mAttribs[ct].stride, mAttribs[ct].ptr + mAttribs[ct].offset); } - rsc->checkError("RsdVertexArray::setupGL2 done"); + rsdGLCheckError(rsc, "RsdVertexArray::setup done"); } //////////////////////////////////////////// RsdVertexArrayState::RsdVertexArrayState() { |