From 407cae950325682a56fe5373dd218a666da901ef Mon Sep 17 00:00:00 2001 From: Alex Sakhartchouk Date: Fri, 6 May 2011 14:59:45 -0700 Subject: rsLib cleanup Change-Id: Ifb66059338e3435ac79435296a650c44699921aa --- libs/rs/driver/rsdVertexArray.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'libs/rs/driver/rsdVertexArray.cpp') 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 #include +#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() { -- cgit v1.1