diff options
| author | Alex Sakhartchouk <alexst@google.com> | 2011-05-06 14:59:45 -0700 |
|---|---|---|
| committer | Alex Sakhartchouk <alexst@google.com> | 2011-05-06 14:59:45 -0700 |
| commit | c19ff0177a7a0dadfc01b1990f822354fdc95991 (patch) | |
| tree | 1e10957941dded2cd689e07c33f953e86f088e33 /driver/rsdVertexArray.cpp | |
| parent | 7f126c78a107257090c6675ea40ffac41516a9dc (diff) | |
| download | android_frameworks_rs-c19ff0177a7a0dadfc01b1990f822354fdc95991.tar.gz android_frameworks_rs-c19ff0177a7a0dadfc01b1990f822354fdc95991.tar.bz2 android_frameworks_rs-c19ff0177a7a0dadfc01b1990f822354fdc95991.zip | |
rsLib cleanup
Change-Id: Ifb66059338e3435ac79435296a650c44699921aa
Diffstat (limited to 'driver/rsdVertexArray.cpp')
| -rw-r--r-- | driver/rsdVertexArray.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/driver/rsdVertexArray.cpp b/driver/rsdVertexArray.cpp index d0a5a54b..62ec107a 100644 --- a/driver/rsdVertexArray.cpp +++ b/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() { |