Moving attrib creation to Mesh. Adding arrays as shader inputs.

Removing fixed size arrays.

Change-Id: I0213e403a2f1283dd43f21bea770aeb059561903

1 files changed, 6 insertions, 4 deletions

diff --git a/libs/rs/rsProgramFragment.cpp b/libs/rs/rsProgramFragment.cpp
index 800854b44aeb..d089a5a3947e 100644
--- a/libs/rs/rsProgramFragment.cpp
+++ b/libs/rs/rsProgramFragment.cpp
@@ -146,17 +146,19 @@ void ProgramFragment::createShader()
 
 void ProgramFragment::init(Context *rsc)
 {
-    mUniformCount = 0;
+    uint32_t uniformIndex = 0;
     if (mUserShader.size() > 0) {
         for (uint32_t ct=0; ct < mConstantCount; ct++) {
-            initAddUserElement(mConstantTypes[ct]->getElement(), mUniformNames, &mUniformCount, RS_SHADER_UNI);
+            initAddUserElement(mConstantTypes[ct]->getElement(), mUniformNames, mUniformArraySizes, &uniformIndex, RS_SHADER_UNI);
         }
     }
-    mTextureUniformIndexStart = mUniformCount;
+    mTextureUniformIndexStart = uniformIndex;
     char buf[256];
     for (uint32_t ct=0; ct < mTextureCount; ct++) {
         sprintf(buf, "UNI_Tex%i", ct);
-        mUniformNames[mUniformCount++].setTo(buf);
+        mUniformNames[uniformIndex].setTo(buf);
+        mUniformArraySizes[uniformIndex] = 1;
+        uniformIndex++;
     }
 
     createShader();