From 9d71e2180062931416092f26276a07e55b318f62 Mon Sep 17 00:00:00 2001 From: Alex Sakhartchouk Date: Mon, 8 Nov 2010 15:10:52 -0800 Subject: Moving attrib creation to Mesh. Adding arrays as shader inputs. Removing fixed size arrays. Change-Id: I0213e403a2f1283dd43f21bea770aeb059561903 --- libs/rs/rsProgramVertex.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libs/rs/rsProgramVertex.cpp') diff --git a/libs/rs/rsProgramVertex.cpp b/libs/rs/rsProgramVertex.cpp index 4e64008..9ee2eeb 100644 --- a/libs/rs/rsProgramVertex.cpp +++ b/libs/rs/rsProgramVertex.cpp @@ -202,14 +202,14 @@ void ProgramVertex::transformToScreen(Context *rsc, float *v4out, const float *v void ProgramVertex::init(Context *rsc) { - mAttribCount = 0; + uint32_t attribCount = 0; + uint32_t uniformCount = 0; if (mUserShader.size() > 0) { for (uint32_t ct=0; ct < mInputCount; ct++) { - initAddUserElement(mInputElements[ct].get(), mAttribNames, &mAttribCount, RS_SHADER_ATTR); + initAddUserElement(mInputElements[ct].get(), mAttribNames, NULL, &attribCount, RS_SHADER_ATTR); } - mUniformCount = 0; for (uint32_t ct=0; ct < mConstantCount; ct++) { - initAddUserElement(mConstantTypes[ct]->getElement(), mUniformNames, &mUniformCount, RS_SHADER_UNI); + initAddUserElement(mConstantTypes[ct]->getElement(), mUniformNames, mUniformArraySizes, &uniformCount, RS_SHADER_UNI); } } createShader(); -- cgit v1.1